git pull遇到错误:error: Your local changes to the following files would be overwritten by merge 分类: git 还原到和服务器版本一致:git reset --hard git pull 标签: none