[root@datacenter190 h5]# pwd
/usr/local/nginx/html/h5
[root@datacenter190 h5]# git pull
Updating 8b4b548..6899227
error: Your local changes to the following files would be overwritten by merge:
awen/index.html
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
zhiyueH5/index.html
删除掉没有add到仓库的文件,操作记得慎重,以免改动文件的丢失
[root@datacenter190 h5]# git clean -d -fx
Removing MP_verify_tLZEHF6dFX4Y4HBL.txt
Removing award/
Removing document/integralRules.html_back
Removing document/user-privacy.html.bak
Removing zhiyueH5/
再次git pull 就恢复正常了