[Insight-developers] gerrit approval

[Bill Lorensen]

Yes, you can delete it

use the -D flag as it suggests.

On Wed, Feb 2, 2011 at 1:42 PM, Sean McBride <sean at rogue-research.com> wrote:
> On Wed, 2 Feb 2011 18:29:16 +0000, Williams, Norman K said:
>
>>1. The builds are kicked off when you do the initial push.
>>2. Once a patch is approved, you can push it to the master with
>>    git gerrit-merge
>>
>>It's usually up to the patch author to do the merge, and it's better to
>>do it ASAP to reduce the potential for merge conflicts.  If you happen
>>to hit any merge conflicts, git will tell you and suggest how to fix
>>it.  These used to be rather misleading, I think they've fixed them now.
>
> After 'git gerrit-merge' is done, should one be able to delete their
> local branch?  When I try, it tells me:
>
> error: The branch 'more-misc-warning-fixes' is not fully merged.
> If you are sure you want to delete it, run 'git branch -D more-misc-
> warning-fixes'.
>
> --
> ____________________________________________________________
> Sean McBride, B. Eng                 sean at rogue-research.com
> Rogue Research                        www.rogue-research.com
> Mac Software Developer              Montréal, Québec, Canada
>
>
> _______________________________________________
> 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
>