DEV Community

loading...
Cover image for How to abort the whole git stash process if a merge conflict has occurred in Git?

How to abort the whole git stash process if a merge conflict has occurred in Git?

melvin2016 profile image MELVIN GEORGE Originally published at melvingeorge.me ・1 min read

Originally posted here!

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 merge --reset
Enter fullscreen mode Exit fullscreen mode

command.

This has worked for me. I hope this works for you too! Cheers 😃.

Feel free to share if you found this useful 😃.


Discussion (0)

Forem Open with the Forem app