将2个Git Repo历史记录复制到新的父目录（我认为）

Question

I have .git repos in foo/bar and foo/baz . The projects began as separate projects but have since become identical.

I now want to "copy" the two existing repos into the parent directory foo . I've been reading up on subtree, filter, merging, moving, etc but I don't know what is the right thing to do.

I'm guessing I would create a new .git repo in the parent foo and "copy" the histories of both foo/bar and foo/baz into foo . Neither of the existing repos have branches.

If that's right, how do I go about doing it?

I don't want to delete the foo/bar and foo/baz histories. I just want to copy those histories into the new parent repo and continue committing to foo .

Answer 1

Regardless or not whether there are conflicts, they can be resolved (quite clumsily though with no common ancestors, but nevertheless).

So, assuming the only branches in bar and baz are both called master , we do:

$ cd /path/to/foo
$ git init
$ git remote add bar bar
$ git remote add baz baz
$ git fetch bar master:bar
$ git fetch baz master:baz

At this point you have a new foo repository with an empty branch master , a branch bar with the contents from the foo/bar repository and a branch baz with the contents from the foo/baz repository.

$ git merge bar
$ git merge baz

At this point, you may get merge conflicts if there are any files with the same name that had different contents. Example output:

Auto-merging somefile.txt
CONFLICT (add/add): Merge conflict in somefile.txt
Automatic merge failed; fix conflicts and then commit the result.

At this point somefile.txt will contain the contents of both versions. Resolve the conflicts as usual and do

$ git commit

to finish the merge.

As a result you now have a master branch with the history of both bar and baz joining up at merge commit you just created. You also still have branches bar and baz and the remotes bar and baz . You can get rid of them if you like.