If you had by mistake pop a stash in a wrong branch and you now have conflicts, just do
1
2
3
git reset HEAD --hard
git checkout my_correct_branch
git stash pop
If you had by mistake pop a stash in a wrong branch and you now have conflicts, just do
1
2
3
git reset HEAD --hard
git checkout my_correct_branch
git stash pop