On Friday, October 4, 2013 8:24:46 PM UTC+2, Eric wrote: > Hi All, > > Apologies if this was asked somewhere else but my colleague and I haven't > been able to find any mention of a situation like this before. > > Context: > 1. We started in CVS with a Main Repository "A" and within it, a > subdirectory "B" > 2. We migrated to GIT and preserved all history - we have Main Repository > "A," and pulled out subdirectory "B" into it's own repository. "A" and "B" > are now two entirely separate repositories. > > Question: > Is there a way to bring "B" back into Main Repository "A" and preserve all > history (for both)? "A" and "B" have now progressed a bit, otherwise we > would just scrap the whole thing and do the migration over again. > >
Did you try out a normal subtree merge? http://nuclearsquid.com/writings/subtree-merging-and-you/ -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
