[OpenStack-Infra] How to merge two branches on Gerrit

James E. Blair corvus at inaugust.com
Fri Nov 20 02:10:14 UTC 2015


Takehiro Kaneko <myphone.tk at gmail.com> writes:

> Hi,
>
> How can I merge the develop branch into the master branch on Gerrit?
> This is regarding openstack/python-rackclient.
>
> I tried the following command but got an error message.
>
> (develop) git checkout master
> (master)  git merge develop
> (master)  git review -t merge-develop
> No changes between HEAD and gerrit/master. Submitting for review would
> be pointless.

Try these instructions from the manual:

http://docs.openstack.org/infra/manual/drivers.html#merge-feature-branch-into-master

-Jim



More information about the OpenStack-Infra mailing list