[Insight-developers] git gerrit-merge trouble

[Cory Quammen]

Hi,

I'm trying to git gerrit-merge this patch:
http://review.source.kitware.com/#change,2089,patchset=6.

I've rebased off the current master (as of this email):
http://www.itk.org/gitweb?p=ITK.git;a=commit;h=6646dbabff6fd1263fa105d016932d3f95f1f452

So now 'git log -oneline' reports:

96ee95d ENH: Several enhancements for ConvolutionImageFilter
6646dba Merge topic 'FixSignedInitializationWarning'
0c632bf COMP:  Removed signed initializer compiler warning
...

When I try 'git gerrit-merge', I get the error

To git at itk.org:stage/ITK.git
 ! [rejected]        HEAD -> ConvolutionImageFilterEnhancements
(non-fast-forward)
error: failed to push some refs to 'git at itk.org:stage/ITK.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

After rebasing on master, I'm not sure how this would not be a
fast-forward merge.

I'm at a loss. Any ideas?

Thanks,
Cory


-- 
Cory Quammen
Research Associate
Department of Computer Science
University of North Carolina at Chapel Hill
http://www.cs.unc.edu/~cquammen