I'm using SourceTree for Windows v18.104.22.168.
I'm unable to abort merges launched in an external merge tool - even after I've clicked abort in the modal dialogue opened by SourceTree, when I close the external merge tool (without saving the tmp file), SourceTree marks the conflicted file as resolved.
I'm using WinMerge as a custom merge tool, with the command "C:\Program Files (x86)\WinMerge\WinMergeU.exe" and argument "$MERGED" to make use of WinMerge's conflict file merge facility.
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.Read more
The Atlassian Certification you've been waiting for is here for good. We're thrilled to announce the official launch of our new Certification for Project Administration in Jira Server! The offering ...
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!
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