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?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.