[git] pull encountered an error: error: your local changes to the following files would be overwritten by merge:

Time:2021-10-24

In this case, how to keep the local changes while merging the remote ones?

First, it depends on whether you want to save local changes.(yes / no)

yes

git stash  
git pull origin master  
git stash pop

During git stage, you will take a local snapshot, and then git pull will not stop you. After the pull, your code does not retain your modifications. Surprised! Don’t worry, what did we seem to have done before?
STASH
At this time, execute git stash pop. When you go to the local area, you will find that the conflicting local modifications are still there. At this time, you can commit and push whatever you want.

no
Since you don’t want to keep the local changes, it’s easy to do. Directly restore the local state to the previous commit ID. Then use the remote code to directly overwrite the local code.

git reset --hard 
git pull origin master

Original address