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

因此，此錯誤消息有大量資源，並且沒有給出的解決方案適用於我。我不知道這是一個OS X問題還是什麼，但我最終不得不創建一個全新的回購庫作爲我的臨時解決方案。我試圖運行在OS X（酋長）終端應用程序（bash shell中）git pull，並得到了消息：OS X 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")

來源

2016-02-28 David Vogel

向我們顯示'git status'的輸出。 – Roman

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

來源

2016-02-28 21:52:04

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

回答

相關問題