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

docs conflicts.md: clarify the revert example a bit

Browse Source 
Yuya's suggestion from
<https://github.com/jj-vcs/jj/pull/6415#discussion_r2061122640>.

Co-authored-by:  Yuya Nishihara <yuya@tcha.org>
This commit is contained in:
Ilya Grigoriev 2025-04-25 19:45:07 -07:00
parent 1f14f7a0ff
commit 5a735182ac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/technical/conflicts.md
View File

@ -57,9 +57,9 @@ rebased to head without resolving conflicts and still not get messy recursive
conflicts.
As another example, let's go through what happens when you back out a conflicted
commit. Let's say we have the usual `C+(B-A)` conflict on top of non-conflict
state C. We then revert that change. Reverting a change means applying its
reverse diff, so the result is `(C+(B-A))+(C-(C+(B-A)))`, which we can simplify
to just `C` (i.e. no conflict).
commit. Let's say we have the usual `E = C+(B-A)` conflict on top of
non-conflict state `C`. We then revert that change. Reverting a change means
applying its reverse diff `-(E-C)`, so the result is `E+(C-E) =
(C+(B-A))+(C-(C+(B-A)))`, which we can simplify to just `C` (i.e. no conflict).
[merge-rs]: https://github.com/jj-vcs/jj/blob/main/lib/src/merge.rs