问题现象：git pull 出现
error: the following untracked working treee files would be overwritten by merge: .gitignore
解决方法：使用git clean -f -d
