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)

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: High High
    • None
    • 1.6.1
    • 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

            [SRCTREE-1670] Merge conflicts resolve using mine rather than theirs (and vice-versa)

            is the fix also included in version  "SourceTree 3.4.16 [18 December 2023]" for windows?

            Jochen Riedlinger added a comment - is the fix also included in version  "SourceTree 3.4.16 [18 December 2023] " for windows?

            Fix available in version 4.2.6. Kindly upgrade to latest version.

            Arati Mohanty added a comment - Fix available in version 4.2.6. Kindly upgrade to latest version.

            Ben Ward added a comment -

            Atlassian doesn't seem to prioritize Sourcetree issues. This bug from 2013 and another years-old bugs are the reason we are moving away from using it. Of course, they will probably cheer when they no longer have to support this free product.  I would say this makes sense.  If the company truly can't afford to support it, they should stop pretending to be charitable benefactors to the community and just focus on their paid tier.  This kind of thing just makes them look like hypocrites.

            Ben Ward added a comment - Atlassian doesn't seem to prioritize Sourcetree issues. This bug from 2013 and another years-old bugs are the reason we are moving away from using it. Of course, they will probably cheer when they no longer have to support this free product.  I would say this makes sense.  If the company truly can't afford to support it, they should stop pretending to be charitable benefactors to the community and just focus on their paid tier.  This kind of thing just makes them look like hypocrites.

            Additionally to the bug, implementing the following would mitigate so much confusion: https://jira.atlassian.com/browse/SRCTREE-1579

            Deleted Account (Inactive) added a comment - Additionally to the bug, implementing the following would mitigate so much confusion: https://jira.atlassian.com/browse/SRCTREE-1579

            Joe Page added a comment -

            I get a kick out of reading updates here every once and a while..

            The truth is – if this is ever fixed I'll probably just mess it up since I'm so used to selecting the opposite action to what makes sense to me. I hope if it's ever done someone adds a little tooltip explaining what each option really does.

            Joe Page added a comment - I get a kick out of reading updates here every once and a while.. The truth is – if this is ever fixed I'll probably just mess it up since I'm so used to selecting the opposite action to what makes sense to me. I hope if it's ever done someone adds a little tooltip explaining what each option really does.

            Why hasn't this been fixed yet?  How long does it take to just change the labels to read "Resolve using left" and "Resolve using right"?  At least then we could rely on the <<<<<<< arrows to tell us what's going to happen.

             

            I know I'm just ranting here, but seriously, how do problems like this make it past QA?  Did not a single person actually use this feature before it got shipped?  Surely everyone who uses this immediately realizes it is backwards...

             

            Jason Pepas added a comment - Why hasn't this been fixed yet?  How long does it take to just change the labels to read "Resolve using left" and "Resolve using right"?  At least then we could rely on the <<<<<<< arrows to tell us what's going to happen.   I know I'm just ranting here, but seriously, how do problems like this make it past QA?  Did not a single person actually use this feature before it got shipped?  Surely everyone who uses this immediately realizes it is backwards...  

            I was cursing at source tree again this weekend when I did resolve using mine again, hoping it was fixed.

            Can we get the bloody thing fixed already?

            richardlalancette added a comment - I was cursing at source tree again this weekend when I did resolve using mine again, hoping it was fixed. Can we get the bloody thing fixed already?

            Why does it still need verification? The problem is still there, acknowledged by @junger and it is quite confusing. Also, not only on mac, it's in all versions of the product.

            Jogchem Andre Oord added a comment - Why does it still need verification? The problem is still there, acknowledged by @junger and it is quite confusing. Also, not only on mac, it's in all versions of the product.

            Richard Lalancette added a comment - - edited

            Actually, the problem is that theirs does like mine does... tested on a simple merge conflict test.

            So this is also a bug.

            Richard Lalancette added a comment - - edited Actually, the problem is that theirs does like mine does... tested on a simple merge conflict test. So this is also a bug.

            You rock Joel! Thanks.

            David Blundell added a comment - You rock Joel! Thanks.

              43c951f935c6 Raman Sidarakin (Inactive)
              0fdfae3104f5 Chris Rusby
              Affected customers:
              39 This affects my team
              Watchers:
              36 Start watching this issue

                Created:
                Updated:
                Resolved: