欢迎您访问程序员文章站本站旨在为大家提供分享程序员计算机编程知识!
您现在的位置是: 首页

git push origin master 异常 error: failed to push some refs to ‘https://gitee.com/...

程序员文章站 2022-07-11 08:29:09
...

异常详情:

 

$ git push origin master
To https://gitee.com/bismillah/zzsn_-kgplt_-frontend.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://gitee.com/***'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解决过程:

说明:执行git push origin master 之前已执行git pull --rebase origin master命令

1、先删除git pull --rebase origin master产生的文件

$ rm -fr .git/rebase-merge/

2、删除之后需要重新切换到mater分支

$ git checkout master

3、然后重新执行提交命令

$ git add .
$ git status
$ git commit -m "commit info"
$ git pull --rebase origin master
$ git push origin master
Enumerating objects: 385, done.
Counting objects: 100% (385/385), done.
Delta compression using up to 16 threads
Compressing objects: 100% (331/331), done.
Writing objects: 100% (384/384), 1021.25 KiB | 11.88 MiB/s, done.
Total 384 (delta 27), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (27/27), done.
remote: Powered by GITEE.COM [GNK-6.2]
To https://gitee.com/****.git
   0d058b6..0a6d718  master -> master

相关标签: 版本问题 git