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>
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.