From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Thu, 29 Jul 2010 18:22:01 GMT
Subject: Re: What is the scenario for a commit with 3 or more parents
Message-ID: <AANLkTikpLHdMzbpix8jnyS6YwSkgie=Ts44AJP5dA4=T@mail.gmail.com>
In-Reply-To: <C77AA970-4288-487F-9568-E86CF776FCED@gmail.com>

Heya,

On Thu, Jul 29, 2010 at 13:10, Joshua Juran <jjuran@gmail.com> wrote:
> How about if you had two (or more) components with a shared protocol, and
> you updated each to speak a new (and incompatible) protocol.  The changes to
> each component might be done in separate topic branches, but you'd want to
> merge them all at once.
>
> $ git checkout master
> $ git merge client-v2 server-v2

Very nice example, but do we have it _documented_ anywhere? If not, it
would be great if you could add that somewhere :)

-- 
Cheers,

Sverre Rabbelier