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

妖狐艹你老母 2024-02-20 11:44 7阅读 0赞

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  
>

如图：

![5c3be724195d4353be2a4c57565f2a33.png][]

解决方法：

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已经提交，到代码仓库看，也确实已经提交成功。![favicon32.ico][]https://blog.csdn.net/zhangphil/article/details/133182434][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_favicon32.ico_https_blog.csdn.net_zhangphil_article_details_133182434]

[5c3be724195d4353be2a4c57565f2a33.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/02/20/069f76d268f84847a69a41f745c056a4.png
[favicon32.ico]: https://image.dandelioncloud.cn/pgy_files/images/2024/02/20/bd52897e4e634ae0b872a604d2d55540.png
[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_favicon32.ico_https_blog.csdn.net_zhangphil_article_details_133182434]: https://blog.csdn.net/zhangphil/article/details/133182434