Question

因此，此错误消息有足够的资源，并且所给出的解决方案都不适用于我。我不知道它是OS X问题还是什么，但我最终不得不创建一个全新的repo作为我的临时解决方案。我试图在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

OS X git pull error：合并时将覆盖对以下文件的本地更改：

1 个答案: