How to merge nested git repo into parent repo, retaining history?

Question

Now I know most git experts will immediately think of git rebase, but I am using the word \"rebase\" in the more general sense: I have the following structure o

Answer 1

Use a subtree merge.

I would list out the steps, but they are in the answer to this question: How do you merge two git repositories?