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

Resolve merge command blows away entire file, irrespective of conflicts

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • High
    • None
    • 2.0.5.8, 2.6, 2.6.1
    • Git
    • Severity 1 - Critical

    Description

      The “Resolve Conflicts > Resolve Using {Mine|Theirs}” commands in SourceTree do not behave as expected. Rather than resolving conflicts according to the selected side, it seems that the ENTIRE FILE is replaced by either “mine” or “theirs”.

      As a user, I expect that the successfully auto-merged chunks remain intact (as they first do prior to conflict resolution). Instead, they are unexpectedly reverted.

      Verifying this bug has been made more troublesome by the fact that SourceTree does not log in its command history panel what it's actually doing when I choose a resolve command.

      The current behaviour renders the “Resolve Conflicts” command mostly useless (and indeed dangerous), making a manual treatment (by editing the text of the conflicted merge product) the only way to achieve the correct merge.

      Attachments

        1. 100-105-pass-exam-get-high-score-dumpsit.pdf
          1.32 MB
          dumpsit
        2. 156-215.80-pass-exam-get-high-score-dumpsit.pdf
          471 kB
          dumpsit
        3. 156-915.80-pass-exam-get-high-score-dumpsit.pdf
          450 kB
          dumpsit
        4. 200-105-pass-exam-get-high-score-dumpsit.pdf
          804 kB
          dumpsit
        5. 200-125-pass-exam-get-high-score-dumpsit.pdf
          715 kB
          dumpsit
        6. 200-150-pass-exam-get-high-score-dumpsit.pdf
          691 kB
          dumpsit
        7. 200-155-pass-exam-get-high-score-dumpsit.pdf
          626 kB
          dumpsit
        8. 200-310-pass-exam-get-high-score-dumpsit.pdf
          557 kB
          dumpsit
        9. 200-355-pass-exam-get-high-score-dumpsit.pdf
          657 kB
          dumpsit
        10. 200-601-pass-exam-get-high-score-dumpsit.pdf
          621 kB
          dumpsit
        11. 201-450-pass-exam-get-high-score-dumpsit.pdf
          453 kB
          dumpsit
        12. 202-450-pass-exam-get-high-score-dumpsit.pdf
          1.08 MB
          dumpsit
        13. 210-060-pass-exam-get-high-score-dumpsit.pdf
          439 kB
          dumpsit
        14. 70-779-pass-exam-get-high-score-dumpsit.pdf
          1.50 MB
          dumpsit
        15. 98-364-pass-exam-get-high-score-dumpsit.pdf
          1.02 MB
          dumpsit
        16. 98-366-pass-exam-get-high-score-dumpsit.pdf
          523 kB
          dumpsit
        17. 98-380-pass-exam-get-high-score-dumpsit.pdf
          4.93 MB
          dumpsit

        Issue Links

          Activity

            People

              Unassigned Unassigned
              46bd7cdb6479 Ben Kennedy
              Votes:
              1 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated: