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

That file isn't in the current branch yet, so you can't remove it with git rm --cache. Just use rm.