[Insight-developers] Trouble merging gerrit topic

[M Stauffer (V)]

Hi,

I'm having trouble merging this topic:
http://review.source.kitware.com/#change,2913

I get this error from git gerrit-merge:

To git at itk.org:stage/ITK.git
 ! [rejected]        HEAD -> NewCCMetrics (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.

even though the branch is rebased onto the current itk master. Any
thoughts? Thanks.

Cheers,
Michael