[vtk-developers] Merge commit not allowed

[Bill Lorensen]

I never rebase. I always just pull. What is the difference?

That worked.

So much to learn...

Thanks,

Bill

On Sat, Jul 17, 2010 at 8:36 AM, Karthik Krishnan
<karthik.krishnan at kitware.com> wrote:
> Hi Bill:
>
> Did you rebase w.r.t origin/master before "git push" and was the rebase
> successful ?
>
>   git pull --rebase
>
> Merges are disabled for now.
>
> --
> karthik
>
>
> On Sat, Jul 17, 2010 at 5:27 PM, Bill Lorensen <bill.lorensen at gmail.com>
> wrote:
>>
>> Folks,
>>
>> I found a memory leak in vtkImporter.cxx. I committed the change to my
>> repo. When I try to push it I get the following:
>>
>> merge commit 87719e0 not allowed
>> error: hook declined to update refs/head/master
>> ...
>> ! [remote rejected] master  -> master (hook declined)
>>
>> My hooks are up to date.
>>
>> Ideas?
>>
>> Bill
>> _______________________________________________
>> Powered by www.kitware.com
>>
>> Visit other Kitware open-source projects at
>> http://www.kitware.com/opensource/opensource.html
>>
>> Follow this link to subscribe/unsubscribe:
>> http://www.vtk.org/mailman/listinfo/vtk-developers
>>
>
>