Resolve using theirs leaves >> conflict markers for XML files

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Medium
    • 1.4.0
    • Affects Version/s: 1.1.1
    • Component/s: Git
    • None

      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>

              Assignee:
              Steve Streeting (Inactive)
              Reporter:
              D K
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

                Created:
                Updated:
                Resolved: