So you just tried to do a git pull and got the following error:

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

How to fix Untracked Working Trees Overwritten Merge

You can fix this error by first adding and stashing your local files before performing the pull.

git add * 
git stash
git pull