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 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