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
Next: Root
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.
I am doing a rebase and get conflicts.
When choosing context menu->Resolve Conflicts->Launch External Merge Tool I get a dialogue that contains the text "Nr of unsolved conflicts: 0" and all I have to do is save and quit to continue.
Obviously my external diff tool, Kdiff3, knows how to handle the diff but SourceTree does not.
Is there a way to avoid having to start the external merge tool (quite tedious with right-click, click, click) and have SourceTree resolve the difference by itself?
Hi Ola,
Which Sourcetree version are you using? Are you on Windows or Mac?
Cheers,
Ana
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.