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

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