问题描述 error: The following untracked working tree files would be overwritten by merge… 解决方案 git reset --hard HEAD git clean -f -d git pull 参考 [1] http://blog.chinaunix.net/uid-10415985-id-4142896.html