git pull更新代码,报错信息:
error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.javaPlease, commit your changes or stash them before you can merge.Aborting
执行命令:
-
git stash
-
git pull
-
git stash pop
然后冲突的代码就给拉下来了 进入IDEA根据提示解决完冲突
git add . 添加新增的文件
git commit -m "注释信息"
git push
git push origin master命令提交当前工作目录下的分支到远程master分支
https://blog.csdn.net/carfge/article/details/79691360?utm_source=blogxgwz9 git 拉取远程分支到本地