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

This is an opportunity for the 'git clean' command. If you don't care about the untracked files ... git clean -n to see what will be removed, and git clean -f to go ahead and rm untracked files.

Add -d to the commands to also operate on directories:

  git clean -dn
  git clean -df