git branch diverged

On branch feature/worker-interface
Your branch and ‘origin/dev’ have diverged,
and have 1 and 4 different commit(s) each, respectively;
git pull 时候出现分支冲突；
解决方案：
1.查看哪个commit冲突
git cherry origin/dev
2.查看日志，确定要回退的冲突前的commit
git log
3.回退
git reset --hard
4.更新
git pull