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

출처

http://stackoverflow.com/questions/4858047/error-the-following-untracked-working-tree-files-would-be-overwritten-by-checko

git clean  -d  -fx ""

이걸로 한방에 해결했다..

-x means ignored files are also removed as well as files unknown to git.

-d means remove untracked directories in addition to untracked files.

-f is required to force it to run.