error: Untracked working tree file '' would be overwritten by merge.

git 钩子目录执行:
git reset --hard HEAD    
git clean -f -d    
git pull