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

Using Mercurial Sourcetree to resolve Merge Conflict when I need 2-way resolution

Suppose I have 2 branches, Branch 1 and Branch 2, and I have made changes to the same file in both branches. Further suppose I have made 2 changes in each file, where Change 1 is to the same line in each file, and Change 2 is to the same line in each file. And finally, I choose Merge. I want Change 1 in Branch 1 to win, and I want Change  2 in Branch 2 to win.

I don't see a way to do this with Sourcetree without calling my External Merge Tool. It seems that the Resolve Conflct options are all or nothing in terms of Mine vs Theirs. Is that correct?

1 answer

1 accepted

0 votes
Answer accepted
minnsey Atlassian Team Dec 04, 2018


That is correct, from within Sourcetree we offer file level theirs/mine options for but for more nuanced merges re rely on the external tools.

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,333 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