Ask is moving to Stack Overflow and Serverfault.com! Please use the "opendaylight" tag on either of these sites. This site is now in Read-Only mode

Revision history [back]

click to hide/show revision 1
initial version

Try rebasing it first ....And then push the patch .. it should work.

Say your branch is branch_1 and you want to push code to master

git checkout branch_1

git rebase master

resolve conflicts if any and then add / commit / push

Try rebasing it first ....And then push the patch .. it should work.I encountered with same (similar ) problem Gerrit: remote rejected (you are not allowed to upload merges)

Say your Rather than doing a rebase of the patch, I did a cherry-pick of the patch on to a branch (which is branch_1 based on updated master or stable/beryllium in my case) , resolved conflicts if any that arises due to cherry-pick and you want to push code to masteruploaded the patch. It worked like a charm . Following are steps.

git checkout branch_1stable/beryllium git pull git checkout -b newbranch git fetch https://git.opendaylight.org/gerrit/l2switch refs/changes/89/38489/3 && git cherry-pick FETCHHEAD git mergetool -t meld git cherry-pick --continue

git rebase master

resolve conflicts if any and then add / commit / push

I encountered with same (similar ) problem Gerrit: remote rejected (you are not allowed to upload merges)

Rather than doing a rebase of the patch, I did a cherry-pick of the patch on to a branch (which is based on updated master or stable/beryllium in my case) , resolved conflicts if any that arises due to cherry-pick and uploaded the patch. It worked like a charm . Following are steps.

git checkout stable/beryllium

git pull pull

git checkout -b newbranch new_branch

git fetch https://git.opendaylight.org/gerrit/l2switch refs/changes/89/38489/3 && git cherry-pick FETCHHEAD FETCH_HEAD

git mergetool -t meld meld

git cherry-pick --continue

I encountered with same (similar ) problem Gerrit: remote rejected (you are not allowed to upload merges)

Rather than doing a rebase of the patch, I did a cherry-pick of the patch on to a branch (which is based on updated master or stable/beryllium in my case) , resolved conflicts if any that arises due to cherry-pick and uploaded the patch. It worked like a charm . Following are steps. Please accept answer if you agree with provided solution.

git checkout stable/beryllium

git pull

git checkout -b new_branch

git fetch https://git.opendaylight.org/gerrit/l2switch refs/changes/89/38489/3 && git cherry-pick FETCH_HEAD

git mergetool -t meld

git cherry-pick --continue

I encountered with same (similar ) problem Gerrit: remote rejected (you are not allowed to upload merges)

Rather than doing a rebase of the patch, I did a cherry-pick of the patch on to a branch (which is based on updated master or stable/beryllium in my case) , resolved conflicts if any that arises due to cherry-pick and uploaded the patch. It worked like a charm . Following are steps. Please accept answer if you agree with provided solution.

git checkout stable/beryllium

stable/beryllium;

git pull

git checkout -b new_branch

git fetch https://git.opendaylight.org/gerrit/l2switch refs/changes/89/38489/3 && git cherry-pick FETCH_HEAD

git mergetool -t meld

git cherry-pick --continue