git remote update # create new branch based on master git checkout -B euphrates-sync-$(date -I) origin/master # rebase on euphrates git rebase origin/stable/euphrates # or to pick patches git rebase -i origin/stable/euphrates # resolve conflicts # submit all patches to gerrit git review stable/euphrates
+2 all in Gerrit and Submit including parents. From: [email protected] [mailto:[email protected]] On Behalf Of Alec Hothan (ahothan) Sent: Wednesday, October 18, 2017 1:15 PM To: [email protected] Subject: [opnfv-tech-discuss] [releng] How to merge master to euphrates with gerrit I have many commits in master which I’d like to merge to stable/euphrates. Would like to check if anybody knows how to merge master into a release branch using gerrit? Looks like I may need the permission to upload merges with Gerrit. Here is what I did: $ git fetch origin stable/euphrates:euphrates $ git checkout euphrates $ git merge master –no-ff # at this point, so far so good, I got all my commits into my euphrates branch # git review fails due to permission: $ git review Warning: Permanently added '[gerrit.opnfv.org]:29418,[198.145.29.81]:29418' (RSA) to the list of known hosts. remote: Processing changes: refs: 1, done To ssh://gerrit.opnfv.org:29418/nfvbench.git ! [remote rejected] HEAD -> refs/publish/master/euphrates (you are not allowed to upload merges) error: failed to push some refs to 'ssh://[email protected]:29418/nfvbench.git' Is there a different way to achieve this? I do not want to cherry pick my commits as I have too many of them. Thanks Alec
_______________________________________________ opnfv-tech-discuss mailing list [email protected] https://lists.opnfv.org/mailman/listinfo/opnfv-tech-discuss
