When merge.conflictStyle is set to diff3/zdiff3, Gittyup will try to include the "base" code snippet in the "ours" code snippet when doing conflict resolution in the GUI. To support diff3 style, it would be better to add a "Use Base" action (or something equivalent) like the "Use Ours" and "Use Theirs" actions. The "base" snippet should only be used by the "Use Base" action (or something equivalent).
Screenshot of the issue in the GUI:
diff3/zdiff3 conflictStyle is this:
<<<<<<< ours:sample.txt
or cleanly resolved because both sides changed the same way.
Conflict resolution is hard;
let's go shopping.
||||||| base:sample.txt
or cleanly resolved because both sides changed identically.
Conflict resolution is hard.
=======
or cleanly resolved because both sides changed the same way.
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
The default conflictStyle is this:
<<<<<<< ours:sample.txt
Conflict resolution is hard;
let's go shopping.
=======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
When
merge.conflictStyleis set todiff3/zdiff3, Gittyup will try to include the "base" code snippet in the "ours" code snippet when doing conflict resolution in the GUI. To support diff3 style, it would be better to add a "Use Base" action (or something equivalent) like the "Use Ours" and "Use Theirs" actions. The "base" snippet should only be used by the "Use Base" action (or something equivalent).Screenshot of the issue in the GUI:
diff3/zdiff3conflictStyle is this:The default conflictStyle is this: