Avoid "Nr of unsolved conflicts: 0" in SourceTree (rebase)

[Ola Fjelddahl]

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?

[Ana Retamal]

Hi Ola,

Which Sourcetree version are you using? Are you on Windows or Mac?

Cheers,

Ana

[Ola Fjelddahl]

Windows, version 3.0.12.