git stash pop error: Your local changes to the following files would be overwritten by merge:

Felipebros answered on January 10, 2023 Popularity 4/10 Helpfulness 10/10

answer git stash pop error: Your local changes to the following files would be overwritten by merge:

git stash pop error: Your local changes to the following files would be overwritten by merge:

Comment

For those who do have un-committed work, and want to pop their stash without losing that work, here is a way (with thanks to @iFreilicht):

Temporarily stage any uncommitted changes:

 git add -u .
Now you can apply your stash without git complaining (hopefully):

 git stash pop
Now unstage everything, but leave the files as they are now:

 git reset
If step 2 couldn't patch cleanly due to conflicting changes, then you will need to resolve the conflicts manually. git diff should help you find them. git mergetool might help by opening your editor with before and current files.

Popularity 4/10 Helpfulness 10/10 Language shell

Source: stackoverflow.com

Tags: git-stash local shell

Link to this answer
Share Copy Link

Contributed on Jan 10 2023

Felipebros

0 Answers Avg Quality 2/10

git stash pop error: Your local changes to the following files would be overwritten by merge:

Contents

More Related Answers

git stash pop error: Your local changes to the following files would be overwritten by merge:

Grepper

Documentation

Social

Legal

Contact

Oops, You will need to install Grepper and log-in to perform this action.