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

0

you are not allowed to upload merges

asked 2016-05-22 10:45:07 -0700

ambika.tripathy gravatar image

I am getting error as: "you are not allowed to upload merges" when i am pushing my changed to odl git repo. how to resolve it?

log: AMBTRIPA-M-X1Q0:yang-push ambtripa$ git push ssh://ambika.tripathy@git.opendaylight.org:29418/yang-push.git HEAD:refs/drafts/master Counting objects: 57, done. Delta compression using up to 8 threads. Compressing objects: 100% (47/47), done. Writing objects: 100% (57/57), 11.88 KiB | 0 bytes/s, done. Total 57 (delta 16), reused 0 (delta 0) remote: Resolving deltas: 100% (16/16) remote: Processing changes: refs: 1, done
To ssh://ambika.tripathy@git.opendaylight.org:29418/yang-push.git ! [remote rejected] HEAD -> refs/drafts/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://ambika.tripathy@git.opendaylight.org:29418/yang-push.git'

edit retag flag offensive close merge delete

1 answer

Sort by ยป oldest newest most voted
0

answered 2016-05-22 22:06:21 -0700

saisujithreddy gravatar image

updated 2016-05-24 11:54:22 -0700

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

git checkout -b new_branch

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

git mergetool -t meld

git cherry-pick --continue

edit flag offensive delete publish link more
Login/Signup to Answer

Question Tools

Follow
1 follower

Stats

Asked: 2016-05-22 10:45:07 -0700

Seen: 727 times

Last updated: May 24 '16