Re: [frogs] Patch for Issue #830

["Trevor Daniels" <t.daniels@xxxxxxxxxxx>]

Mark Polesky wrote Monday, December 21, 2009 1:42 AM


> Trevor Daniels wrote:
> > Actually, I don't think rebase is mentioned in the CG.  I
> > can't see it on a quick trawl.  It should be, as a branch
> > should be rebased before a patch is generated from it if
> > master has been updated since the branch was created, else
> > inadvertent reverts might be included.
> >
> > I'll have a closer look tomorrow to see what should be
> > done.
>
> Trevor, you should know that I might be restructuring the CG
> quite a bit in the coming days...
>
> http://lists.gnu.org/archive/html/lilypond-devel/2009-12/msg00487.html

No problem; git handles multiple changes.  However
you should always update master and rebase your
branch before pushing it - that way, if there are any
conflicts, you will see them and can deal with them
before attempting to push.

> p.s. why are all these replies coming in twice?

Because they are sent to two lists and you are
subscribed to both.

Trevor



---
----
Join the Frogs!