git抛错：Your branch and ‘xxx‘ have diverged,and have xx and xx different commits each, respectively._and have 78 and 119 different commits each, respec

git抛错：Your branch and 'xxx' have diverged,and have xx and xx different commits each, respectively.

$ git status
On branch 5.6
Your branch and 'origin/xxx' have diverged,
and have 6 and 17 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean
 

如图：

解决方法：

 git reset --hard origin/xxx

接着：

git pull origin

git reset origin --hard解决‘Your branch is ahead of ‘origin/xxxx‘ by xx commit.’_zhangphil的博客-CSDN博客文章浏览阅读377次。git删除/撤销远已经push到程服务器上某次代码提交场景：不小心把一次错误的代码push到远程服务器上的分支上，需要立即删除/撤销这次代码提交。具体方法，git命令：git reset --hard git push origin HEAD --forcecommit_id可以通过git命令：git log输出获取。git删除/撤销远已经push到程服务器上某次代码提交_git删除某次push_zhangphil的博客-CSDN博客。明明2个commits已经提交，到代码仓库看，也确实已经提交成功。https://blog.csdn.net/zhangphil/article/details/133182434