Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
badges earned

Your Points Tracker
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,334 views 4 5
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