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

docs conflicts.md: fix confusing typo

Browse Source 
Fix #6414.
This commit is contained in:
Ilya Grigoriev 2025-04-25 16:39:37 -07:00
parent 13477940af
commit 1f14f7a0ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/technical/conflicts.md
View File

@ -59,7 +59,7 @@ conflicts.
As another example, let's go through what happens when you back out a conflicted 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 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 state C. We then revert that change. Reverting a change means applying its
reverse diff, so the result is `(C+(B-A))+(A-(C+(B-A)))`, which we can simplify reverse diff, so the result is `(C+(B-A))+(C-(C+(B-A)))`, which we can simplify
to just `A` (i.e. no conflict). to just `C` (i.e. no conflict).
[merge-rs]: https://github.com/jj-vcs/jj/blob/main/lib/src/merge.rs [merge-rs]: https://github.com/jj-vcs/jj/blob/main/lib/src/merge.rs