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

Question

While trying to do git pull, it gives me below erro.

error: The following untracked working tree files would be overwritten by merge:
        ... <list of files> ...
Please move or remove them before you merge.
Aborting

Answer 1

The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to "pull" your system would be forced to overwrite the local files which are not version controlled.

Try running

git add * 
git stash
git pull

This will track all files, remove all of your local changes to those files, and then get the files from the server.

Also, often times, git add -A .; git stash worked for me. The git add * variant complained about ignored paths