Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-13799

Resolve Conflicts -> Mine/Theirs when popping from Stash both confirm commit id of last commit

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • Low
    • None
    • 3.3.9
    • UX
    • None
    • Severity 3 - Minor

    Description

      After doing a stash-pop and going to resolve conflicts, regardless of if I pick "mine" or "theirs" I get the same popup:

      However the file is not set to the state of that commit (but rather to the stash's state) if I pick "theirs" (which is confusing, I want MY files! I understand why the terms are called "mine" and "theirs" because of which branch is checked out, but come on).

      Attachments

        Activity

          People

            Unassigned Unassigned
            d2b7bc2f029b major_johnson
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated: