Git冲突:commit your changes or stash them before you can merge. 解决办法
用git pull来更新代码的时候,遇到了下面的问题:
error: Your local changes to the following files would be overwritten by merge:
xxx/xxx/xxx.java'
Please, commit your changes or stash them before you can merge.
Aborting
出现这个问题的原因是其他人修改了xxx.java并提交到版本库中去了,而你本地也修改了xxx.php
原创
2021-09-27 14:51:05 ·
186 阅读 ·
0 评论