Assume you have conflicts after executing git stash pop
:
- Resolve the conflicts manually by yourself
- Use
git reset
to mark conflicts as resolved - Drop the stash using
git stash drop
because git doesn’t do it if conflicts occur
Assume you have conflicts after executing git stash pop
:
git reset
to mark conflicts as resolvedgit stash drop
because git doesn’t do it if conflicts occur