Git pull-请在合并之前移动或删除它们

我试图从我的服务器做一个 git pull origin master，但不断得到错误:

Please move or remove them before you can merge.

没有未跟踪的文件，但似乎有问题与 被忽略的文件的某些原因。

我试着运行一个 git clean -nd来查看哪些文件会被删除，它列出了一大堆在 .gitignore中被忽略的文件。

我要怎么修好这个才能拔出来？

236408 次浏览
小开
最佳答案

Apparently the files were added in remote repository, no matter what was the content of .gitignore file in the origin.

As the files exist in the remote repository, git has to pull them to your local work tree as well and therefore complains that the files already exist.

.gitignore is used only for scanning for the newly added files, it doesn't have anything to do with the files which were already added.

So the solution is to remove the files in your work tree and pull the latest version. Or the long-term solution is to remove the files from the repository if they were added by mistake.

A simple example to remove files from the remote branch is to 

$git checkout <brachWithFiles>
$git rm -r *.extension
$git commit -m "fixin...."
$git push

Then you can try the $git merge again

小开

I just faced the same issue and solved it using the following.First clear tracked files by using :

git clean -d -f

then try git pull origin master

You can view other git clean options by typing git clean -help

小开

If you are getting error like

  • branch master -> FETCH_HEAD error: The following untracked working tree files would be overwritten by merge: src/dj/abc.html Please move or remove them before you merge. Aborting

Try removing the above file manually(Careful). Git will merge this file from master branch.

小开

To remove & delete all changes git clean -d -f

小开

If there are too many files to delete, which is actually a case for me. You can also try the following solution:

1) fetch

2) merge with a strategy. For instance this one works for me:

git.exe merge --strategy=ours master

提交答案