I need to figure out if there is a way to determine which file was used to resolve a conflict. Mine or theirs during a merge. We have that one guy who always uses theirs to merge and stomps on everyone else's changes. Looking back through the history I can see that there was a conflict but cant seem to find which branch he used to resolve the conflict.
There's no indication of what branch was used from a DVCS perspective that I'm aware of at the moment. The only workaround I can think of is to checkout the mangled branch and in another copy of the repo checkout one of the two merged branches and compare them using your favorite visual diff tool.
Senior Mac Developer, Sourcetree
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events