Martin von Zweigbergk 92629ded4c docs: make technical conflicts doc better match our recent thinking ...

These days, we usually think of conflicts as one base state and series
of diffs between other states. The base state is normally the parent
when rebasing.

Also, we're deprecated `jj backout` in favor of `jj revert`, so let's
use that terminology.

2025-04-25 13:53:28 +00:00

..

architecture.md

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

concurrency.md

docs: fix a mention of the deleted jj checkout command

2025-01-26 17:09:05 +00:00

conflicts.md

docs: make technical conflicts doc better match our recent thinking

2025-04-25 13:53:28 +00:00

types.svg

docs: update types diagram to reflect rename of LocalBackend to SimpleBackend

2025-03-18 06:52:00 +00:00