正文
Your branch and remoteBranchName have diverged solution
提示：扫一扫查出行【扫一扫了解最新限行尾号】
复制提示
(zhuan)git pull时解决分支分叉（branch diverged）问题git pull时出现分支冲突(branch diverged)
$ git status
# On branch feature/worker-interface
# Your branch and 'origin/br_dev' have diverged,
# and have 1 and 4 different commit(s) each, respectively.
解决办法：
1、查看哪个commit冲突
git cherry origin/br_dev
2、回退到冲突的前一个commit
git reset --hard <commitID>
3、更新代码
git pull
zhuanzi https://www.cnblogs.com/coffy/p/7650564.html
git pull时出现分支冲突(branch diverged)
$ git status
# On branch feature/worker-interface
# Your branch and 'origin/br_dev' have diverged,
# and have 1 and 4 different commit(s) each, respectively.
解决办法：
1、查看哪个commit冲突
git cherry origin/br_dev
2、回退到冲突的前一个commit
git reset --hard <commitID>
3、更新代码
git pull
zhuanzi https://www.cnblogs.com/coffy/p/7650564.html
