Got a merge conflict in my pom.xml files and tried resolve conflict in SourceTree (Windows 220.127.116.11) 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>
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG