Philip Metzger 6cbb21f86f conflicts: document the "same-change rule" ...

I think its time to finally give our Conflict Algebra rule a term.
This is will make our documentation alot easier, and gives it a name for
new design docs.

All credit goes to @martinvonz for coming up with the term in #4988.

2025-05-14 15:08:29 +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

conflicts: document the "same-change rule"

2025-05-14 15:08:29 +00:00

types.svg

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

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