Medium Got a merge conflict in my pom.xml files and tried resolve conflict in SourceTree (Windows 1.1.1.0) using 'Use Theirs'.
When I checked the Stage I could see it left the start conflict end conflict markers in the file:
<modules>
<module>mod-a</module>
<<<<<<< HEAD
<module>mod-b</module>
=======
<module>mod-c</module>
<module>mod-d</module>
>>>>>>> 6e703d8... comment
</modules>