Can't do a git pull

Question

I\'m trying to do a git pull and get the error message:

error: The following untracked working tree files would be overwritten by merge:


        

Answer 1

As it says in the original error message, that file is untracked. That means git doesn't know anything about it. Just remove it from the filesystem using rm. If you care about the contents, just move it somewhere else.