From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Fri, 05 Jun 2009 17:15:55 GMT
Subject: Re: Best way to merge two repos with same content, different history
Message-ID: <200906051915.56115.markus.heidelberg@web.de>
In-Reply-To: <63BEA5E623E09F4D92233FB12A9F794303117DBF@emailmn.mqsoftware.com>

Kelly F. Hickel, 05.06.2009:
> 	Other than using manually format-patch on every branch in new,
> then applying the patches (presumably with regular old patch, since the
> ancestor commit IDs won't match), is there any "good" way to merge "new"
> into "old"?

If rebasing 'new' on top of 'old' isn't an option, then you could try:

    $ git checkout new
    $ git merge -s ours old

It's the other way round (not merging 'new' into 'old', but vice versa),
but there is now merge strategy "theirs".

Markus