标签：git
error: Untracked working tree file ‘‘ would be overwritten by merge.
git 钩子目录执行：
git reset --hard HEAD
git clean -f -d
git pull
本文出自 “xieping_linux” 博客，请务必保留此出处http://xieping.blog.51cto.com/3715452/1632195
标签：git
原文地址：http://xieping.blog.51cto.com/3715452/1632195
