<HTML>
<HEAD>
<TITLE>Re: [vtk-developers] Merge commit not allowed</TITLE>
</HEAD>
<BODY>
<FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'>The difference is hard to describe concisely. The Pro Git book has a pretty good description:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'><a href="http://progit.org/book/ch3-6.html">http://progit.org/book/ch3-6.html</a><BR>
<BR>
</SPAN></FONT></BLOCKQUOTE><FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'>For what it’s worth, I find the Pro Git book a good reference for all things git. Although you can view the whole thing online, it’s handy to have the reference sitting on your desk.<BR>
<BR>
-Ken<BR>
<BR>
<BR>
On 7/17/10 10:32 AM, "Bill Lorensen" <<a href="bill.lorensen@gmail.com">bill.lorensen@gmail.com</a>> wrote:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'>I never rebase. I always just pull. What is the difference?<BR>
<BR>
That worked.<BR>
<BR>
So much to learn...<BR>
<BR>
Thanks,<BR>
<BR>
Bill<BR>
<BR>
On Sat, Jul 17, 2010 at 8:36 AM, Karthik Krishnan<BR>
<<a href="karthik.krishnan@kitware.com">karthik.krishnan@kitware.com</a>> wrote:<BR>
> Hi Bill:<BR>
><BR>
> Did you rebase w.r.t origin/master before "git push" and was the rebase<BR>
> successful ?<BR>
><BR>
> git pull --rebase<BR>
><BR>
> Merges are disabled for now.<BR>
><BR>
> --<BR>
> karthik<BR>
><BR>
><BR>
> On Sat, Jul 17, 2010 at 5:27 PM, Bill Lorensen <<a href="bill.lorensen@gmail.com">bill.lorensen@gmail.com</a>><BR>
> wrote:<BR>
>><BR>
>> Folks,<BR>
>><BR>
>> I found a memory leak in vtkImporter.cxx. I committed the change to my<BR>
>> repo. When I try to push it I get the following:<BR>
>><BR>
>> merge commit 87719e0 not allowed<BR>
>> error: hook declined to update refs/head/master<BR>
>> ...<BR>
>> ! [remote rejected] master -> master (hook declined)<BR>
>><BR>
>> My hooks are up to date.<BR>
>><BR>
>> Ideas?<BR>
>><BR>
>> Bill<BR>
>> _______________________________________________<BR>
>> Powered by www.kitware.com<BR>
>><BR>
>> Visit other Kitware open-source projects at<BR>
>> <a href="http://www.kitware.com/opensource/opensource.html">http://www.kitware.com/opensource/opensource.html</a><BR>
>><BR>
>> Follow this link to subscribe/unsubscribe:<BR>
>> <a href="http://www.vtk.org/mailman/listinfo/vtk-developers">http://www.vtk.org/mailman/listinfo/vtk-developers</a><BR>
>><BR>
><BR>
><BR>
_______________________________________________<BR>
Powered by www.kitware.com<BR>
<BR>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html">http://www.kitware.com/opensource/opensource.html</a><BR>
<BR>
Follow this link to subscribe/unsubscribe:<BR>
<a href="http://www.vtk.org/mailman/listinfo/vtk-developers">http://www.vtk.org/mailman/listinfo/vtk-developers</a><BR>
<BR>
<BR>
<BR>
</SPAN></FONT></BLOCKQUOTE>
</BODY>
</HTML>