Git出现 Your local changes to the following files would be overwritten by merge: con
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.
解决办法：
1、服务器代码合并本地代码
$ git stash //暂存当前正在进行的工作。
$ git pull origin master //拉取服务器的代码
$ git stash pop //.
原创
2021-05-25 16:16:32 ·
484 阅读 ·
0 评论
关注
分享
扫一扫