[Insight-developers] Trouble merging gerrit topic

[M Stauffer (V)]

>> 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?
>
>Yes, if the merge works without conflicts.  Note that "gerrit-merge"
>actually has nothing to do with Gerrit at all.  It is named that way
>because our goal is that Gerrit will eventually be the underlying
>implementation of the command.  Right now gerrit-merge actually pushes
>the changes to an intermediate "topic stage" repository on itk.org.
>Then it invokes a command on the server via ssh to tell it to merge
>the change.  This is all hidden behind the gerrit-merge alias.

OK, that makes sense now.

> > What could we have done to get it pushed to topic stage 
>w/out merging?
>
>If you did gerrit-merge and the merge failed with conflicts then the
>topic would have been left on the stage.  In that case instructions
>should have been emitted about how to proceed.

Yes, that's what happened, after the change to master that removed the
data submodule, I believe. I saw the instructions to merge my branch
with the latest master, but must have missed the part about deleting the
topic stage. Thanks.

-M