...
- 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>).
- Add code from external git repo to ACME (git read-tree --prefix=<external_subdir>/ -u <external_commit>).
- Commit the change (git commit).
- 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 (cd <external-subdir>; git diff --name-only v0.0 .). If there are changes (non-blank output), follow the 'Merge changes from external into ACME subtree' 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. 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 (git rm -r <external-subdir>).
- Add code from external git repo to ACME (git read-tree --prefix=<external_subdir>/ -u <external_commit>).
- 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. 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>).
- Merge from external git repo to ACME (git merge --squash -X subtree=<external_subdir> --no-commit <external_commit>).
- Commit the change (git commit).
- Test and submit a pull request as defined in the development practices page.
...