GIT: ! [remote rejected] HEAD -> refs/for/master (you are not allowed to upload merges)

gerrit 不能推送 merge

$ git push origin HEAD:refs/for/master
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.91 KiB | 977.00 KiB/s, done.
Total 9 (delta 5), reused 0 (delta 0)
remote: Resolving deltas: 100% (5/5)
remote: Processing changes: refs: 1, done
To https://gerrit.onap.org/r/vfc/nfvo/lcm
 ! [remote rejected] HEAD -> refs/for/master (you are not allowed to upload merges)
error: failed to push some refs to 'https://gerrit.onap.org/r/vfc/nfvo/lcm'
解决办法:

git rebase (会提示出有冲突的文件)

进入冲突文件,编辑,手动修改

git add 冲突文件

此时git 状态可能是(master|rebase)状态

可以执行 git rebase --continue 退出rebase 状态

然后查看git 状态 git status 是否在默认状态下

git stash

# 每次 push 前 git pull --rebase

git push origin HEAD:refs/for/master

git pull

git stash pop

结果:

rebmemer@DESKTOP-FQONAMC MINGW64 ~/Desktop/three/lcm (master)
$ git push origin HEAD:refs/for/master
Counting objects: 12, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 2.73 KiB | 933.00 KiB/s, done.
Total 12 (delta 9), reused 0 (delta 0)
remote: Resolving deltas: 100% (9/9)
remote: Processing changes: new: 1, updated: 1, refs: 2, done
remote:
remote: New Changes:
remote:   https://gerrit.onap.org/r/65527 add update_serializer
remote:
remote:
remote: Updated Changes:
remote:   https://gerrit.onap.org/r/65151 serializer for UpdateNsRequest
remote:
To https://gerrit.onap.org/r/vfc/nfvo/lcm
 * [new branch]      HEAD -> refs/for/master
 

  • 1
    点赞
  • 14
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值