Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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?



Windows, version 3.0.12.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

7,113 views 5 13
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you