Git pull - Please move or remove them before you can merge

Question

I am trying to do a git pull origin master from my server but keep getting the error:

Please move or remove them before you can merge.

Answer 1

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