Then to-be-merge-result of E would require much of effort. Imagine if changes from A to (B, C) deviates itself very far if compared to changes from A to D. With the help of colorizing diff between each version, this would reduce time and reduce number of guesses from the one who would be merging. It’d be so helpful to see content in base, yours and theirs version. Perforce 3-way linear diff format (by default)īut in a more complicated case, it is not enough to just take a look only at a linear 3-way diff format above. cab9282 is just an example of SHA1 for git hash. Git 3-way linear diff format (need git config -global nflictstyle diff3). Most of merge conflicts I have resolved can be easily done by looking at a linear 3-way diff view alone without a need to look at each separate content of each file.Ī linear 3-way diff (that I’d like to say) is as follows > feature_branch

Encountering a situation to resolve a merge conflict that is harder than usual as well as taking longer time won’t come in very often.

Winmerge git diff