resolvent:

1. Do not keep your own code, as long as the server’s code

git reset –hard

git pull origin master

2. Keep your own code

git stash
git pull origin master
git stash pop