[Insight-developers] Trouble merging gerrit topic

M Stauffer (V) mstauff at verizon.net
Fri Oct 7 17:09:58 EDT 2011


>Nothing in our standard workflow involves pushing to the topic stage
>prior to the final merge.  If your team pushed the topic to the stage
>repository but did not merge and then rewrote it then you need to
>force-push it to get it on the stage again:
>
>   git push stage +HEAD
>
>After that gerrit-merge should work.

This makes me realize I don't know enough about the details of how
gerrit works. If all we do with a branch is 'git gerrit-push', and then
eventually a 'git gerrit-merge', it should be fine, right? What could we
have done to get it pushed to topic stage w/out merging?

-M



More information about the Insight-developers mailing list