When popping out commits using the git stash pop
command, you will have some merge conflicts sometimes, you can move to resolve those conflicts or abort the whole process.
To abort the whole process when a merge conflict has occurred during the git stash pop
process is to use the,
# Stop Git stash on merge conflicts
git reset --merge
command.
This has worked for me. I hope this works for you too! Cheers 😃.