git拉取远端分支merge到本地分支解决冲突 盛世美颜 2021-01-21 264 阅读1分钟 git拉取远端分支merge到本地分支解决冲突的命令 git fetch origin master git merge origin/master 解决冲突 Automatic merge failed; fix conflicts and then commit the result. 冲突解决完成执行 git add . git commit -m “merge master”
