赞
踩
Pulling is not possible because you have unmerged files
已经解决:请看error:failed to push some refs to ‘xxxx.git‘_刘贵庆的博客-CSDN博客(开始时:使用的分支为dev分支,接下来代码提交到远程lgq分支。)git checkout lgqgit add .git commit -m "xxxx"git pushgit push origin lgq 此时报错:error:failed to push some refs to 'xxxx.git'(请先保存代码到另外地方。)解决方法:git pullgit pull --rebase origin lgq (远程lgq分支库同步到本地lgq分支)git log .https://blog.csdn.net/xysxlgq/article/details/124598957