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

    • Type: Bug
    • Status: Needs Triage (View Workflow)
    • Priority: Low
    • Resolution: Unresolved
    • Affects Version/s: 1.6.1
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Symptom Severity:
      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

            Assignee:
            Unassigned
            Reporter:
            chris.rusby Chris Rusby
            Votes:
            34 Vote for this issue
            Watchers:
            33 Start watching this issue

              Dates

              Created:
              Updated: