You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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?
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.