【Git】push 分支报错 error: failed to push some refs to...

文章目录

报错消息
解决方法

报错消息

示例图：

示例代码：

➜ fisher git:(test) git push origin test
To git.woa.com:wxg-bigdata/fisher.git! [rejected]          test -> test (fetch first)
error: failed to push some refs to 'git.woa.com:wxg-bigdata/fisher.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first 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.woa.com: wxg-bigdata / fisher.git
!(拒绝 ]           测试→首先测试(获取)
Error: failed to push some refs to 'git.woa.com:wxg-bigdata/fish .git'
提示:更新被拒绝，因为远程包含您所做的工作
提示:没有本地。这通常是由另一个存储库推送引起的
提示:相同的ref。你可能想要首先集成远程更改
提示:(例如，'git pull…')然后再推。
提示:请参阅'git push—help'中的'Note about fast-forward '获取详细信息。

解决方法

分析：这是由于你push推送分支前，未进行pull拉取最新代码，导致版本不一致
解决：回退到合并之前的代码，pull拉取最新代码，再push推送分支

注意：这种解决方法适用于2个分支之间的merge操作，比如test分支回退版本，那test上合并的代码会丢失，等你test分支能成功pull后，需要重新merge开发分支上的代码合并到test上。所以记得保留这个版本的代码再回退到上一个版本，等pull成功，再重新合并代码

查看最近3次提交的历史版本

➜  fisher git:(test) git log -3          # 查看最近3次提交的历史版本
commit da20b931f4e04a61f0f9b4e4726a2e907e566fc9 (HEAD -> test)
Merge: 33df706e 6018c237
Author: v_isiliu <v_isiliu@tencent.com>
Date:   Wed Jan 19 09:58:40 2022 +0800Merge branch 'feture/tapd#870810123' into testcommit 6018c237278f5265e78314049d6642e493ebdb5e (feture/tapd#870810123)
Author: v_isiliu <v_isiliu@tencent.com>
Date:   Wed Jan 19 09:57:50 2022 +0800feat: 发布版本'feture/tapd#870810123'commit 33df706e780d10af6435bda1fee85430604eebfc
Merge: 1d06cd1f 7589979d
Author: v_isiliu <v_isiliu@tencent.com>
Date:   Tue Jan 18 16:11:21 2022 +0800Merge branch 'feature/date#0118' into test

回退到上一个版本

➜  fisher git:(test) git reset --hard 33df706e780d10af6435bda1fee85430604eebfc
HEAD is now at 33df706e Merge branch 'feature/date#0118' into test

再进行pull更新分支

➜  fisher git:(test) git pull origin test

重新合并当前分支

➜  fisher git:(test) git merge feture/tapd#870810123

最后再 push 上去

➜  fisher git:(test) git push origin test

【Git】push 分支报错 error: failed to push some refs to...相关推荐

push时git报错 error: failed to push some refs to 'git@gitee.com:git_zn/jianli.git' 解决办法...
完整的错误提示如下 To gitee.com:git_zn/jl.git! [rejected] master -> master (fetch first) error: failed to ...
git切换分支报错:error: pathspec 'origin/XXX' did not match any file(s) known to git
项目上有一个分支test,使用git branch -a看不到该远程分支,直接使用命令git checkout test报错如下: error: pathspec 'origin/test' did ...
git切换分支报错:error: pathspec 'origin/XXX' did not match any file(s) known to git.
项目上有一个分支testGit,使用Git branch -a看不到该远程分支,直接使用命令git checkout testGit报错如下: error: pathspec 'origin/test ...
git报错error: failed to push some refs to ‘https://gitee.com/XXX/XXX-mater.git‘
报错地方和修改: 解决方法: 1.输入命令: git pull --rebase origin master 先取消commit记录,之后同步远程库到本地,然后再将本地最新的重新push提交就行了. ...
git将本地文件推送到远程仓库时报错: error: failed to push some refs to ‘https://gitee.com/no-talent-all-by-hand/dome
今天使用Git推送本地文件到远程库的时候一直报错 error: failed to push some refs to 'https://gitee.com/no-talent-all-by-hand ...
Git Bash中出现：error: failed to push some refs to ‘https://gitee.com/xxx/xxx.git‘错误的解决方法
Git Bash中出现:error: failed to push some refs to 'https://gitee.com/xxx/xxx.git'错误的解决方法今天上传本地文件,在输入:$ ...
安装32位mysql报错_在CentOS中安装32位或64位MySql报错error: Failed dependencies解决办法...
在CentOS中安装MySql报错error: Failed dependencies解决办法安装64位MySql报错内容如下: error: Failed dependencies: libaio ...
【Mac】Mac下安装MySQL优化工具 percona-toolkit 报错 Error: Failed to download resource openssl@1.1
1.背景 mac 下安装percona-toolkit 报错 Error: Failed to download resource "openssl@1.1" Download f ...
小米MiFlash报错error:FAILED(remote:updatesparsecrclistfailed)
小米10 MIUI12.5退回MIUI11 小米MiFlash刷机工具报错 error:FAILED (remote: update sparse crc list failed) 昨天把小米10从M ...

【Git】push 分支报错 error: failed to push some refs to...

文章目录

报错消息

解决方法

【Git】push 分支报错 error: failed to push some refs to...相关推荐

最新文章

热门文章