[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: What is the scenario for a commit with 3 or more parents
From:       Sverre Rabbelier <srabbelier () gmail ! com>
Date:       2010-07-29 18:22:01
Message-ID: AANLkTikpLHdMzbpix8jnyS6YwSkgie=Ts44AJP5dA4=T () mail ! gmail ! com
[Download RAW message or body]

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]