Sourcetree - resolving merge conflicts sometimes fails silently

Apologies if this is not the place to raise bugs - couldn't find anywhere else on hand, and Bitbucket is the closest relevant tag.

Occasionally, when attempting to resolve a merge conflict in Sourcetree via the diff pane, after a brief wait, the merge conflict is not resolved.

Steps to reproduce:

1. Create a merge conflict.

2. Right click a file in the diff pane, choose Resolve conflicts -> resolve using theirs (can't be sure I've tested using "mine").

3. Occasionally, the Sourcetree client pauses for a moment like it's resolving the conflict, but no action appears to have been taken. 

4. Repeating step 2 will more often than not correctly resolve the merge conflict.

I can't reliably reproduce what causes this to sometimes fail silently and sometimes work as intended.



1 answer

0 vote

Please file a ticket with details at (macOS) or (Windows) and we'll take it from there.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,745 views 1 5
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you