From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 09 Jul 2008 16:48:25 GMT
Subject: Re: Idea: "live branches"?
Message-ID: <32541b130807090948q65d64ea9s7a3c0639c2f2daa2@mail.gmail.com>
In-Reply-To: <m28wwbz8h7.fsf@tnuctip.rychter.com>

On 7/9/08, Jan Rychter <jan@rychter.com> wrote:
>  The way this would work is I would have one or two long-term development
>  branches, and each of those would depend on a list of "live branches",
>  managed by a tool similar to StGIT. I should be able to commit to either
>  the main development branch, or to one of the "live branches", in which
>  case I should be able to easily "resync" the main development branch (do
>  a merge or a rebase, but I would prefer the tool to first remove old
>  merge commits, so as not to clutter history).

Hmm, git rebase already removes old merge commits.  In my own
workflow, I tend to do repeated merges of the "live branch" into my
feature branches during development, then do a rebase occasionally to
clean up the patch set, especially right before merging it into
master.  This seems pretty painless to me.  What specific problem are
you having that prevents this from working?

Have fun,

Avery