Page Comparison

...

<external_branchname> refers to local branch created with git subtree split. In preparation for merging with an upstream repository.

<external_mergebranch> refers to the branch on the external used for merging changes. Depending on the rules for the external, this may be master or an integration branch.

...

Insert new external subtree into ACME (one-time setup)

...

1. Create and switch to a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. If the external code is to be completely replaced, create the branch from the commit where the code was last brought into the ACME repository (similar for the procedure for fixing a bug). The branch name should follow the form github-username/component/component.<version>-import.
2. Add external git repo to as a remote in your local repository copy (git remote add -f --tags <external_name> <external_url>).
3. Add code from external git repo to ACME (git read-tree --prefix=<external_subdir>/ -u <external_commit>).
4. Commit the change (git commit).
5. Test and submit a pull request as defined in the development practices page.

...

1. Pull changes from the ACME subtree into a new branch (git subtree split -P <external_subdir> -b <external_branchname>).
2. If necessary, add remote for updated external (If git remote does not list your remote, add it with git remote add -f --tags <external_name> <external_url>).
3. Create and switch to new external branch ( git checkout -b mct_master --track remotes/<external_name>/<external_mergebranch>).

Related articles

...