[Insight-developers] gerrit-merge error - non-fast-forward

[Brad King]

On 2/6/2012 4:39 PM, David Doria wrote:
>> There is already a topic by that name.  Remember this thread:
>>
>> http://www.itk.org/mailman/private/insight-developers/2011-October/020629.html
>> http://www.itk.org/mailman/private/insight-developers/2011-October/020632.html
>>
>> -Brad
>
> Sounds like another good place for an informative error message:
>
> "A branch with the same name as the branch you are trying to push
> already exists. Please rename your branch."

A message like that assumes too much.  In this case the branch
should be replaced with a newer version with a force push.

-Brad