[vtk-developers] Merge commit not allowed

[Marcus D. Hanwell]

Speaking generally, rebase is roughly equivalent to what cvs/svn up do -
your local changes are applied on top of the new commits in the upstream
repository. In general, on master, release, next etc which are used as
integration branches, should be rebased, and I set this up to happen
locally.

In the VTK git clone you can issue the command,

git config branch.master.rebase true

This will cause a git pull to rebase, rather than merge, by default. There
are similar settings to change git's behavior more globally. When people
merge upstream master into their master, it doesn't provide anything but
noise in the commit log, and currently merge commits are not allowed in VTK
apart from when using the VTK stage described in a previous post.

Marcus

On Sat, Jul 17, 2010 at 10:32 AM, Bill Lorensen <bill.lorensen at gmail.com>wrote:

> 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
> >>
> >
> >
> _______________________________________________
> 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
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100717/c6ae3234/attachment.html>