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