Le 04/12/12 23:20, Jeroen De Dauw a écrit : > I have a feature branch with two dozen commits which I merged into master > locally and now want to push directly to git. All commits have been > reviewed, so going via gerrit makes no sense. (In fact it complains about > the stuff already being closed it I try that.)
Message: ! [remote rejected] master -> master (can not update the reference as a fast forward) That means your master is apparently not based on Gerrit master. I would try merging again: Start out using a clean version of latest origin master: git remote update git checkout -b featuremerge -t origin/master Then merge in your feature branch: git merge featurebranch Your local featuremerge branch should be now be a merge commit with the previous commit being origin/master. Push it for review to Gerrit and submit the resulting change: git push origin featuremerge:refs/for/master If the commits already got reviewed, I guess they are in a branch known to Gerrit? -- Antoine "hashar" Musso _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
