Close external diff tool without solving the conflict marks the conflict as resolved

I use sourcetree with tortoise merge to solve merging conflicts. This works fine, until you open a conflict with tortoise merge and decide not to resolve it yet and you close tortoise merge. Somehow, if you do this, the conflict gets marked as resolved. The code that is created to indicate the conflict (with the <<<< parts) is now ready to commit as normal code.

This is probably not normal behaviour. Does anyone know how to solve this?

1 answer

This happened to me with Apple's FileMerge as well. I didn't save any changes, but for some reason SourceTree thinks that quitting the external editor means that the file has been resolved. 

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

1,123 views 4 2
Read article

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