fatalement logo

Git Stash part 2


If you had by mistake pop a stash in a wrong branch and you now have conflicts, just do

git reset HEAD --hard
git checkout my_correct_branch
git stash pop


Updated: April 29, 2019
Tags: Git stash