Re: The Gnus repository is switching to Git as of 2010-04-19

[Sven Axelsson]

On 21 April 2010 06:00, Stephen J. Turnbull <address@hidden> wrote:
> You've managed what is conceptually a single body of content, using
> two separate trees, both actively developed, with persistently
> different names for the same file(s), and bidirectional merging?

I admit not being completely clear on the implications here, but maybe
you want to look into the subtree merge strategy for git. Some
information here:
http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html.
It is intended for this kind uf usage.

-- 
Sven Axelsson
++++++++++[>++++++++++>+++++++++++>++++++++++>++++++
>++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<.
+++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.