PULL代码时遇到冲突怎么办 error:Your local changes to the following files would be overriten by merge
2017-07-26 20:13
465 查看
当你需要更新提交代码的时候,如果和别人修改了同样的文件,会有如下报错
![](https://oscdn.geek-share.com/Uploads/Images/Content/202009/02/edd70ffc752651258540f0c6531670b9)
解决方案:
1git stash (放到暂存区)
2git pull origin XX (更新代码)
3git stash pop (弹出放入暂存区的内容)
接下来就可以就可以正常的commit 和push啦
一般操作是 git add .(加到本地) git commit -m ‘注释' git push
解决方案:
1git stash (放到暂存区)
2git pull origin XX (更新代码)
3git stash pop (弹出放入暂存区的内容)
接下来就可以就可以正常的commit 和push啦
一般操作是 git add .(加到本地) git commit -m ‘注释' git push
相关文章推荐
- Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决(Git代码冲突)
- 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出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决(Git代码冲突)
- 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 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: xxx.java
- 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:
- Error pulling origin: 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: