Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-1670

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

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • High
    • None
    • 1.6.1
    • None
    • Severity 3 - Minor

    Description

      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

      Attachments

        Activity

          People

            43c951f935c6 Raman Sidarakin
            0fdfae3104f5 Chris Rusby
            Votes:
            39 Vote for this issue
            Watchers:
            36 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: