When applying a stash onto a branch which results in merge conflicts, the UI does not indicate anything. It appears as though the stash has not been applied (nothing to commit, no pending changes, nothing). If you switch to another repo tab and back, then the status is correctly shown in the UI. This was extremely confusing the first time until I figured out what was going on.
Apply Stash with Conflict No Indication
- Assignee:
-
Unassigned
- Reporter:
-
jungers42
- Votes:
-
0 Vote for this issue - Watchers:
-
1 Start watching this issue
- Created:
- Updated: