1. 程式人生 > >Git Pull Failed :Your local changes would be overwritten by merge. Commit, stash or revert them

Git Pull Failed :Your local changes would be overwritten by merge. Commit, stash or revert them

在使用git進行程式碼pull’的時候,出現下面的問題:

Git Pull Failed :Your local changes would be overwritten by merge. Commit, stash or revert them

①如果你想保留剛自己寫的沒有提交push的本地修改的程式碼,並把git伺服器上的程式碼pull到本地(本地剛才修改的程式碼將會被暫時封存起來):

git stash
git pull origin master
git stash pop

②如果你想完全地覆蓋本地的程式碼,只保留伺服器端程式碼,則直接回退到上一個版本,再進行pull:

git reset --hard
git pull origin master  (其中origin master表示git的主分支)