I'm using SourceTree for Windows v184.108.40.206.
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.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
@Davin Studer holds many interests, including but not limited to health tech and Star Trek. Read on to discover more about Davin, from his favorite Confluence macros to his favorite lit...
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