4 ms·
Setting merge conflictstyle diff3 or zdiff3 will improve your experience if you ever do any merging
by pfg_ 2y ago
Setting merge conflictstyle diff3 or zdiff3 will improve your experience if you ever do any merging
- vlovich123 2y agoI just use kdiff3 - automatically solves most merge conflicts & it’s rarely to never done so incorrectly. And when it can’t resolve the merge conflicts, line alignment is very nice. I prefer it to the cluttered experience of BeyondCompare and other more “feature-filled” options.