一、 git diverged
Your branch and 'origin/dev' have diverged, and have 3 and 11 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. (use "git commit" to conclude merge)
解决办法：
- 查看哪个commit冲突
git cherry origin/dev
- 回退到冲突的前一个commit
git reset --hard （commitID）
- 更新代码
git pull
