In Git 2.36, -remerge-diff takes a different approach. The left-most markers show the latter resolution, and the right-most markers show the former.īut this output can be understandably difficult to interpret. In this particular example, the conflict occurs because one side has an extra argument in the dwim_ref() call, and the other includes an updated comment to use reflect renaming a variable from sha1 to oid. These come from the output of git diff-tree -cc, which is showing us the diff between each parent and the post-image of the given commit simultaneously. If you look closely, you might notice that there are actually two columns of diff markers (the + and - characters to indicate lines added and removed).

If you’ve ever passed a conflicted merge to git show, you might be familiar with this output: But it has slightly different behavior when given a merge commit, especially one that had merge conflicts. When given a commit git show will print out that commit’s log message as well as its diff. To explain what -remerge-diff is and why you might be excited about it, let’s take a step back and talk about git show.

This release brings another new feature powered by ort, which is the -remerge-diff option. Returning readers may remember our coverage of merge ort, the from-scratch rewrite of Git’s recursive merge engine. Review merge conflict resolution with –remerge-diff To celebrate this most recent release, here’s GitHub’s look at some of the most interesting features and changes introduced since last time. We last caught up with you on the latest in Git back when 2.35 was released. The open source Git project just released Git 2.36, with features and bug fixes from over 96 contributors, 26 of them new.

Git latest version