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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.