Got a merge conflict in my pom.xml files and tried resolve conflict in SourceTree (Windows 1.1.1.0) using 'Use Thiers'.
It left the start conflcit 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>
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.