Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  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. The branch name should follow the form github-username/component/component.<version>-import.
  2. Test and submit a pull request as defined in the development practices page.

...

Split changes from an ACME subtree for merging with an external repo

NOTE:  If you have to edit code that is in a subtree, commit those separately from other changes.

This workflow is to be used any time changes to an ACME subtree should be shared with the source external repository. For example, consider a bug fix made in the ACME MCT code. This workflow would allow contributing that fix upstream to MCT. Note that this workflow should not be used for the case where the ACME subdirectory was not brought into ACME as a subtree. That workflow is beyond the scope of this document.

  1. Pull changes from the ACME subtree into a new branch (git subtree split -P <external_subdir> -b <external_branchname>).
    1. NOTE:  if the external_subdir has received more then one merge from the external, add --ignore-joins to the above.
  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>).
    1. Similarly, add a remote for <external_repo> if different from <external_name>
  3. Push your branch to the external's repo, in preparation of merging following their workflow: (git push <external_repo> <external_branchname>)Push the branch to the remote repository (git push -u <external_repo> <external_mergebranch>).
  4. Follow other procedures for updating the external (depending on that external's workflow).

...