It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Cannot abort external conflict merges - file is always marked as resolved Edited

I'm using SourceTree for Windows v2.1.2.3.

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.

 

0 comments

Comment

Log in or Sign up to comment
Community showcase
Published in Training & Certification

Introducing Atlassian University Live!

Atlassian University is committed to providing the best training and certification for Atlassian products through on-demand classes, in-person team training, a world-class certification program, and ...

221 views 4 15
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you