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 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.