From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 06 Jun 2007 18:01:09 GMT
Subject: Re: merging two repositories
Message-ID: <Pine.LNX.4.64.0706061859520.4046@racer.site>
In-Reply-To: <4666CB31.9070007@gmail.com>

Hi,

On Wed, 6 Jun 2007, joel reed wrote:

> So now I have two trees, one pure git using repo.or.cz, and the other 
> made by git-svn against Google' subversion.

I'd merge them by fetching the pure-git one into the git-svn'ed. Or vice 
versa. Then, you can say "git merge <other-branch>". If the revisions are 
similiar (or identical), it will succeed even if they do not have any 
common ancestor.

Ciao,
Dscho