Closed wetneb closed 3 months ago
6.9.0.202403050737-r
Linux/Unix, MacOS, Windows
The jgit library produces invalid conflicts when using the "diff3" style. Consider the following example:
a d
a b d
a b c d
In other words, ours deletes the b line and theirs keeps it but inserts the c line after it.
ours
b
theirs
c
The merged result is
a <<<<<<< OURS ||||||| BASE b d ======= b c >>>>>>> THEIRS d
(note the incorrect inclusion of the d in the base part of the conflict hunk, duplicating the d outside of the conflict)
d
The merged result should be
a <<<<<<< OURS ||||||| BASE b ======= b c >>>>>>> THEIRS d
No response
Version
6.9.0.202403050737-r
Operating System
Linux/Unix, MacOS, Windows
Bug description
The jgit library produces invalid conflicts when using the "diff3" style. Consider the following example:
Ours
Base
Theirs
In other words,
oursdeletes thebline andtheirskeeps it but inserts thecline after it.Actual behavior
The merged result is
(note the incorrect inclusion of the
din the base part of the conflict hunk, duplicating thedoutside of the conflict)Expected behavior
The merged result should be
Relevant log output
No response
Other information
No response