Merge conflicts resolve using mine rather than theirs (and vice-versa)

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: High
    • None
    • Affects Version/s: 1.6.1
    • Component/s: None
    • Severity 3 - Minor

      It seems to me that if I have a merge conflict and I select "Resolve Using Theirs..." source tree actually resolves using my changes, and if I select "Resolve Using Mine..." source tree actual resolves using theirs!

      See: https://answers.atlassian.com/questions/180870/merge-conflicts-resolve-using-theirs-vs-mine

            Assignee:
            Raman Sidarakin (Inactive)
            Reporter:
            Chris Rusby
            Votes:
            39 Vote for this issue
            Watchers:
            36 Start watching this issue

              Created:
              Updated:
              Resolved: