Question

I have two separate git repositories for the same version of a single website.

domain.com-1.0
domain.com-2.0

Version 2.0 was completely redone from the ground up. There is no bridge between the two repositories. I would now like to merge the two into a single repository, but maintain the separation.

I have already tagged domain.com-1.0 in it’s repo and now want to clean the working tree and move domain-2.0 and all it’s commit history into 1.0’s repo. Is this possible or is there a better way of accomplishing this?

Note: domain.com-1.0 will not be developed on anymore and is “being retired”.

Answer 1

I would solve this as follows:

1. git remote add the foo-2.0 to the foo-1.0 repo

2. git fetch the stuff from foo-2.0 to the foo-1.0 repo

3. Fire up gitk --all to see the branches and do some proper branch (re)naming.

This should work for simple one-off cases. If you need to do this twice a day, you should think up a way to automate step 3.