[Insight-developers] Trouble merging gerrit topic

[Bill Lorensen]

Before I do a gerrit-merge, I always do:

git checkout master
git pull
git checkout "my topic"
git rebase master
make

This insures that my gerrit topic will merger successfully.

Otherwise, if you do a gerrit-merge, and it fails you will, as Brad
noted, get instructions if the merge fails.

I would rather resolve things ahead of time.


On Fri, Oct 7, 2011 at 5:09 PM, M Stauffer (V) <mstauff at verizon.net> wrote:
>>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
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at
> http://www.kitware.com/opensource/opensource.html
>
> Kitware offers ITK Training Courses, for more information visit:
> http://kitware.com/products/protraining.html
>
> Please keep messages on-topic and check the ITK FAQ at:
> http://www.itk.org/Wiki/ITK_FAQ
>
> Follow this link to subscribe/unsubscribe:
> http://www.itk.org/mailman/listinfo/insight-developers
>