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.

Cheers.

 

1 answer

This widget could not be displayed.

Please file a ticket with details at https://jira.atlassian.com/browse/SRCTREE (macOS) or https://jira.atlassian.com/browse/SRCTREEWIN (Windows) and we'll take it from there.

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted Aug 10, 2018 in Bitbucket

What is your #1 piece of advice to new users getting started using Bitbucket?

Hello Community! My name is Claire Maynard, and I’m a Product Marketing Manager on the Bitbucket team. I’m interested in hearing what advice or tips you have for new users getting started on ...

245 views 14 2
Join discussion

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