Some untracked working tree files would be overwritten by Pull.

December 5, 2015 by flymemory

解决方法：

git add *
git stash
git pull origin master

原理嘛，我也搞不懂。