【error】error: Untracked working tree file 'public/images/icon.gif' would be overwritten by merge.

git reset --hard HEAD    
git clean -f -d    
git pull

• http://blog.chinaunix.net/uid-10415985-id-4142896.html