Question

Trying to come up with the logic and the standard way to do this.

Example.

Remote Repo called “A”

This repo is cloned as “Local A” and and maintains 2 remotes, one master and one upstream. Upstream changes (A) are merged with “Local A” master and pushed. All good.

Remote Repo called “B”

These repo files needs to be included in “Local A” in a sub-directory.

Do I simply add another remote repo to this sub directory and fetch, merge? Is that how it is done normally?

ps. I do not want to use submodules, I simply want to pull files from multiple remotes into one master git, but also have them retain and “upstream” remote to pull in updates and then merge and push to one master.

Answer 1

The answer is at github: http://help.github.com/subtree-merge/

If you need to move directory, just move it as you normally would. If you need to change the history, that’s trickier, but you can find description here: http://help.github.com/split-a-subpath-into-a-new-repo/