[Insight-developers] Merge branched in gerrit

[Luis Ibanez]

Hi Bill,

Thanks for pointing this out.

I'm looking at the patch with perplexity...      :-)

It is clearly something that I did wrong...


I was trying to restore the use of BrainWeb datasets
for some tests, but clearly made something wrong
when submitting the patch.

I'll abandon it, and will try again.


    Luis


-------------------------------------
On Thu, Sep 22, 2011 at 11:54 AM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
> Luis,
>
> I noticed several merge branches for this topic:
> http://review.source.kitware.com/#change,2826
>
> Usually we don't do merge branches here. I typically cherry pick the
> topic onto a recently pulled master. Then I do a
> git commit -a --amend
> git gerrit-push
>
> or
> git check master
> git pullall
> git checkput "your_topic"
> git rebase master
> git commit -a --amend
> git gerrit-push
>
>
> This retains the same change-id
>
> What is the motivation for doing the merges this way?
>
> Bill
>