Geek Answers Handbook

How to see the difference with a merge commit in IntelliJ IDEA?

In the git IntelliJ IDEA window, I see differences in regular commit. But, if the commit is a merge commit, nothing happens when I press cmd + D (show diff). How to see the difference with a merge commit in IntelliJ IDEA?

+7
git intellij-idea
source share
1 answer

To compare a merge transaction with one of its parent commits, simply select both using ctrl-click and split them into cmd-D, as usual. It may be difficult to scroll down to the appropriate parent.

It may be that cmd-D in the merge transaction actually shows merge conflicts and how they were resolved according to the parent commits, but I have not tried. If the merger had no conflicts, such a view would be empty, of course.

+2
source share

More articles:


All Articles