error: Untracked working tree file ‘public/images/icon.gif’ would be overwritten by merge.
error: Untracked working tree file ‘public/images/icon.gif’ would be overwritten by merge.
解决方法
- git reset –hard HEAD //重置head内容
- git clean -f -d //删除些没用的add文件
- git pull //重新拉去新代码