Page Comparison

...

Insert new external subtree into ACME

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.
Add external git repo to ACME.
Test and submit a pull request as defined in the development practices page.

...

Verify that the external code in the ACME repository has been not been modified since the initial commit. If there are changes (non-blank output), follow the 'Replace modified' workflow below.
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.
Add external git repo to as a remote in your local repository copy (git remote add -f --tags <external_name> <external_url>).
Remove the code from your working copy.
Check to see if the version of the code in the ACME repository has been modified since the initial commit. If there are no changes (blank output), skip to step 6. <always go to step 6?>
Add (git rm -r <external-subdir>).
Add code from external git repo to ACME. Now, skip to step 7.To bring in changes to external repo <fill this in with git subtree merge (and git remote add --tags?)> (git read-tree --prefix=<external_subdir>/ -u <external_name>).
Commit the change (git commit).
Test and submit a pull request as defined in the development practices page.

...

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.
If the external code is new (no version is currently in ACME repository), skip to step 5.
If the external code is to be completely replaced, remove the code from your working copy. Then, skip to step 5.
Check to see if the version of the code in the ACME repository has been modified since the initial commit. If there are no changes (blank output), skip to step 6. <always go to step 6?>
Add external git repo to ACME. Now, skip to step 7.
To bring in changes to external repo <fill this in with git subtree merge (and git remote add --tags?)>.
Test and submit a pull request as defined in the development practices page.

...

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.
If the external code is new (no version is currently in ACME repository), skip to step 5.
If the external code is to be completely replaced, remove the code from your working copy. Then, skip to step 5.
Check to see if the version of the code in the ACME repository has been modified since the initial commit. If there are no changes (blank output), skip to step 6. <always go to step 6?>
Add external git repo to ACME. Now, skip to step 7.
To bring in changes to external repo <fill this in with git subtree merge (and git remote add --tags?)>.
Test and submit a pull request as defined in the development practices page.

...

    git diff --name-only v0.0 .

...

    git remote add -f --tags <external_name> <external_url>

...

    git merge -X subtree=the-dir/ $commit

    git read-tree --prefix=<external_subdir>/ -u <external_name>