Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Get started Tell me more
Atlassian Community about banner
4,556,179
Community Members
 
Community Events
184
Community Groups

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

ralvy
ralvy Nov 29, 2018

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?

Answer
Watch
Like Be the first to like this
316 views

1 answer

1 accepted

0 votes
Answer accepted
minnsey
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Dec 04, 2018

Hi

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.

Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

See all events