Re: [Gnu-arch-users] Star merging with 3 branches

[Robert Collins]

On Wed, 2003-12-10 at 23:28, Andrew Suffield wrote:


> [Hey, did anybody ever actually write this stuff up properly? We
> hashed it out on IRC, months ago, over the course of a couple of
> evenings, but the "How to handle conflicts" stuff seems to have been
> forgotten]

I put it up on the Wiki, at the IdempotentMerge page - minus a little
detail, but covering the two basic approaches, from which all else
builds.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.

signature.asc
Description: This is a digitally signed message part