Git 強制pull

git pull時出現 error: Untracked working tree file 'foo.bar' would be overwritten by merge. Aborting

git fetch --all
git reset --hard origin/master

ref: http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull