git pull遇到错误:error: Your local changes to the following files would be overwritten by merge
2017-11-27 15:25
218 查看
出现这个问题的原因是,我个人认为是本地代码和服务器代码冲突,本地的代码将会被服务器的代码覆盖掉,有两种解决的方法:
1.保留本地修改的代码,并把服务器的代码pull到本地
git stash
git pull origin master
git stash pop
服务器上的代码更新到了本地,而且你本地修改的代码也没有被覆盖,之后使用add,commit,push 命令即可更新本地代码到服务器了。
2.完全地覆盖本地的代码,只保留服务器端代码,则直接回退到上一个版本,再进行pull
git reset –hard
git pull origin master
1.保留本地修改的代码,并把服务器的代码pull到本地
git stash
git pull origin master
git stash pop
服务器上的代码更新到了本地,而且你本地修改的代码也没有被覆盖,之后使用add,commit,push 命令即可更新本地代码到服务器了。
2.完全地覆盖本地的代码,只保留服务器端代码,则直接回退到上一个版本,再进行pull
git reset –hard
git pull origin master
相关文章推荐
- git pull遇到错误 error: Your local changes to the following files would be overwritten by merge:
- git pull遇到错误:error: Your local changes to the following files would be overwritten by merge:
- git pull 时出现 error: Your local changes to the following files would be overwritten by merge的解决办法
- git pull 时出现 error: Your local changes to the following files would be overwritten by merge的解决办法
- Git pull error:Your local changes to the following files would be overwritten by merge解决方法
- git pull 时出现 error: Your local changes to the following files would be overwritten by merge的解决办法
- Git pull 报 error: Your local changes to the following files would be overwritten by merge: xxx.java
- Git pull error: Your local changes to the following files would be overwritten by merge:
- git在pull时 Error pulling origin: error: Your local changes to the following files would be overwritten by merge
- Git pull error: Your local changes to the following files would be overwritten by merge:
- [Git] error: Your local changes to the following files would be overwritten by merge
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- git提示 error: Your local changes to the following files would be overwritten by merge:
- [Git] error: Your local changes to the following files would be overwritten by merge