Git冲突:Please commit your changes or stash them before you merge
用git pull来更新代码的时候,遇到了下面的问题:C#error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.phpPlease, commit your changes or stash them before you can merge.Aborting出现这个问题的原因是其他人修改了xxx.php并提交到版本库中去了,而你本地也修改了xxx.p
转载
2021-07-19 15:02:31 ·
37532 阅读 ·
0 评论