cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 15:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflicts: document the "same-change rule"

Browse Source 
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.
This commit is contained in:
Philip Metzger 2025-03-18 17:52:39 +01:00
parent 05c77a853f
commit 4e736bee46
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/technical/conflicts.md
View File

@ -62,4 +62,14 @@ state C. We then back out that change. Backing out ("reverting" in Git-speak) a
change means applying its reverse diff, so the result is `(B+C-A)+(A-(B+C-A))`,
which we can simplify to just `A` (i.e. no conflict).
## same-change rule
The same-change rule is a pragmatic hack on the conflict algebra, which allows
us to consider a conflict as automatically resolved when two sides are the same.
This is similar to Git and Mercurial (hg) and not like Darcs and its
descendants which would consider it a conflict. It also has some unfortunate
consequences like when you rebase a commit to upstream and the upstream rebased
it to where it was before, you may lose changes (any that overlapped with
upstream's changes).
[merge-rs]: https://github.com/jj-vcs/jj/blob/main/lib/src/merge.rs