From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Date: Mon, 03 May 2010 18:04:13 GMT
Subject: Re: patches between different repositories
Message-ID: <q2x86ecb3c71005031104xff08ab8am9a14bb49ebcd154f@mail.gmail.com>
In-Reply-To: <hrn27j$e3b$1@dough.gmane.org>

On 3 May 2010 18:47, Matthias Lehmann <mat@matlehmann.de> wrote:
> Am I doing something wrong here? Or is there another way to merge changes
> within different repositories with differnt layouts?
>
> Any help would be greatly appreciated.

Try sub-tree merge after the initial setup you will get another
repository as a subdirectory after that you can commit moving files
around to match different layout. After that you can just pull & merge
and everything will just work =)

Read $ git help merge