+3

Conflict Resolver: show diverged commits (with their messages)

Will Hains 4 years ago updated by Thomas Singer 4 years ago 1

I use and love the “Conflict Resolver” window every day. It is extremely useful to have a 3-way diff like that. I love the “Base Changes” window as well.

But sometimes it is difficult to understand why the change in either side was made. My suggestion is to show, at the top of the left and right editors, a list of the commits since the common root. The abbreviated SHA1 (perhaps linked, so that clicking opens that commit in the Log view), author, date, and the first line of the message.

Could you please try to create a sketch (screenshot combination) how you think it would have helped you?