OS X git pull錯誤：您對以下文件的本地更改將被合並覆蓋：

Question

因此，對於此錯誤消息，有足夠的資源，並且給定的解決方案都不適用於我。 我不知道這是OS X的問題還是什么，但是我最終不得不創建一個全新的存儲庫作為我的臨時解決方案。 我試圖在OS X（El Capitan）終端應用程序（bash shell）中運行git pull並收到消息：

error: Your local changes to the following files would be overwritten by merge:    
[list/of/changed/files]
Please, commit your changes or stash them before you can merge. Aborting

這是我嘗試過的一些無效的方法：

git reset --hard
git stash save --keep-index
git pull -f
git clean -fd
git checkout -f master

這是git status的輸出（請注意，這些都不是我實際上更改過的文件）：

On branch master
Your branch is behind 'origin/master' by 130 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

modified:   projects/profiod/teammate2Dominion/cardtest1
modified:   projects/profiod/teammate2Dominion/cardtest1.gcda
modified:   projects/profiod/teammate2Dominion/cardtest1.gcno
modified:   projects/profiod/teammate2Dominion/cardtest2
modified:   projects/profiod/teammate2Dominion/cardtest2.gcda
modified:   projects/profiod/teammate2Dominion/cardtest2.gcno
modified:   projects/profiod/teammate2Dominion/cardtest3
modified:   projects/profiod/teammate2Dominion/cardtest3.gcda
modified:   projects/profiod/teammate2Dominion/cardtest3.gcno
modified:   projects/profiod/teammate2Dominion/cardtest4
modified:   projects/profiod/teammate2Dominion/cardtest4.gcda
modified:   projects/profiod/teammate2Dominion/cardtest4.gcno
modified:   projects/profiod/teammate2Dominion/unittest1
modified:   projects/profiod/teammate2Dominion/unittest1.gcda
modified:   projects/profiod/teammate2Dominion/unittest1.gcno
modified:   projects/profiod/teammate2Dominion/unittest2
modified:   projects/profiod/teammate2Dominion/unittest2.gcda
modified:   projects/profiod/teammate2Dominion/unittest2.gcno
modified:   projects/profiod/teammate2Dominion/unittest3
modified:   projects/profiod/teammate2Dominion/unittest3.gcda
modified:   projects/profiod/teammate2Dominion/unittest3.gcno
modified:   projects/profiod/teammate2Dominion/unittest4
modified:   projects/profiod/teammate2Dominion/unittest4.gcda
modified:   projects/profiod/teammate2Dominion/unittest4.gcno
modified:   projects/profiod/teammate2Dominion/unittestresults.out

no changes added to commit (use "git add" and/or "git commit -a")

Answer 1

嘗試git stash;git pull --rebase ; git stash pop git stash;git pull --rebase ; git stash pop