It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Is it possible to tell how a person resolved conflicts when merging two branches? Mine or Theirs?

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. 

1 answer

0 votes
bgannin Atlassian Team Mar 16, 2018

Hi Paul,

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.

Brian Ganninger
Senior Mac Developer, Sourcetree

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,895 views 0 12
Read article

Community Events

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

Events near you