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.

Atlassian Community about banner
4,370,031
Community Members
 
Community Events
168
Community Groups

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

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?

1 answer

0 votes
Ana Retamal Atlassian Team Jan 10, 2019

Hi Ola,

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

Cheers,

Ana

Windows, version 3.0.12.

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events