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

"Resolve Using Theirs" does the same thing as "Resolve Using Mine"

    XMLWordPrintable

Details

    • Bug
    • Resolution: Obsolete
    • High
    • None
    • 1.8.1
    • General
    • Mac OS X Mavericks

    Description

      Rebase with a conflict. Right-click the conflict and "Resolve Using Mine." The diff will show, as expected, that the conflict was resolved using your own side of the branch. (See attachment: Screen Shot 2014-04-07 at 10.25.52 AM.png).

      Abort the rebase to start over. This time, "Resolve Using Theirs." The diff shows that "Mine" overwrote "Theirs" rather than "Theirs" overwriting "Mine." (See attachment: Screen Shot 2014-04-07 at 10.27.10 AM.png)

      I've been able to reproduce this a few times and maybe I just don't understand Mine vs. Theirs, but I am under the impression that when I choose "Theirs" the code I'm rebasing with should overwrite my own.

      Screenshots of my workflow are attached in the order that reproduces what I think is a bug, but again, if my understanding is wrong, please let me know and feel free to close the issue. (Sorry, somehow I attached the same screenshot twice in a row.)

      I've marked this as "Critical" only because, without inspection, it can be very easy to finish the rebase and overwrite the code you intended to keep, effectively losing data.

      Attachments

        Activity

          People

            Unassigned Unassigned
            1171b924-612e-468b-aab2-17dfa5459004 Deleted Account (Inactive)
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: