error: Untracked working tree file ‘public/images/icon.gif‘ would be overwritten by merge.
需要执行下面的命令才能修复：
git reset --hard HEAD
git clean -f -d
git pull
git pull报error: Untracked working tree file 'public/images/icon.gif' would be overwritten by merge
原文：http://www.cnblogs.com/dragonh/p/7647591.html