git Your branch and ‘origin/master’ have diverged

On branch master

Your branch and ‘origin/master’ have diverged,

and have 7 and 8 different commits each, respectively.

处理方法

git rebase origin/master