git: Your branch and ‘origin/master’ have diverged
Question:
Your branch and ‘origin/master’ have diverged,
and have 3 and 8 different commits each, respectively.
(use “git pull” to merge the remote branch into yours)
Resolve:
git fetch origin
git reset –hard origin/master
小记: 还是需要全面了解git,才能遇到报错不方。