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:
vue.config.js
Please commit your changes or stash them before you merge.
出现这个问题的原因是其他人修改了xxx.php并提交到版本库中去了,而你本地也修改了xxx.php,这时候你进行git...
转载
2021-11-18 18:46:50 ·
419 阅读 ·
0 评论