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