Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

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.

Get started Tell me more
Atlassian Community about banner
4,555,228
Community Members
 
Community Events
184
Community Groups

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

Ola Fjelddahl
Ola Fjelddahl Jan 07, 2019

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?

Answer
Watch
Like Be the first to like this
257 views

1 answer

0 votes
Ana Retamal
Ana Retamal
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Jan 10, 2019

Hi Ola,

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

Cheers,

Ana

View More Comments
Ola Fjelddahl
Ola Fjelddahl Jan 14, 2019

Windows, version 3.0.12.

Like
Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

See all events