Details
-
Bug
-
Resolution: Unresolved
-
Low
-
None
-
3.3.9
-
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).