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

No really use if this would work but could be worth a try. Assuming that the src is on a remote server and the parent is on a remote server. You can try the following.

• git clone url to remote server to clone the the repo with tools, lib, and build
• git add remote src url to the src remote repo
• create a tracking branch of the src remote repo and then check it out on the parent repo
• merge remote tracking branch into you main branch.
• delete the second remote.