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

posted @ 2017-10-11 14:55  sunny_2015  阅读(44883)  评论(0编辑  收藏  举报