From: Tim Ottinger <tottinge@progeny.com>
Date: Thu, 08 Sep 2005 18:01:54 GMT
Subject: Re: Merges without bases
Message-ID: <43207C92.4040103@progeny.com>
In-Reply-To: <1125010764.4110.35.camel@localhost.localdomain>

Darrin Thompson wrote:

>What I'm going to do is actually an inversion of that. Publishing a
>repository with the _intent_ of being merged into existing history, and
>observing obvious naming conventions as the "prior arrangement".
>
>I thought once I got the initial baseless merges done and committed that
>I do fetch-octopus from that point on. But octopus was still complaining
>about not finding a merge base. I'm going to verify that I didn't just
>mess something up in the process.
>
>If I can get octopus working as the tool for doing merges _after_ the
>baseless merges then I can live with the current situation. 
>  
>

Heh.  Git repositories as components.

-- 
                             ><>
... either 'way ahead of the game, or 'way out in left field.