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

willemdejong

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?

Julius Niiniran

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.