git拉取代码出现error: Your local changes to the following files would be overwritten by merge:xx.文件
今天用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
解决：
git stash
git pull
git stash pop
接下来diff一下此文件看看自动合并的情况
原创
2021-08-10 09:30:56 ·
582 阅读 ·
0 评论
关注
分享
扫一扫