On 3 May 2010 18:47, Matthias Lehmann <mat@xxxxxxxxxxxxx> 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 -- 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