git reset --hard HEAD
git clean -f -d
git pull
想用git更新本地的代码时出现类似如下error的解决办法
error: Untracked working tree file would be overwritten by merge. Aborting
http://stackoverflow.com/questions/1125968/how-to-force-git-pull-to-overwrite-local-files