Versions Compared

Key

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

...

  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 Switch to your remote and create a new branch for merging git checkout -b mct_master --track remotes/<external_name>/<external_mergebranch>)<external_name>/master; git checkout -b <external_mergebranch>).
  4. Merge the changes from your subtree into your new branch (git merge <external_branchname>).
  5. Push the branch to the remote repository (git push -u <external_name> <external_mergebranch>).
  6. Follow other procedures for updating the external (depending on that external's workflow).

Note that Steps 3+ may be different depending on the rules for updating the external. To simply share the split code, push <external_branchname> to the appropriate remote repository.

Related articles

Filter by label (Content by label)
showLabelsfalse
max5
spacesSE
showSpacefalse
sortmodified
reversetrue
typepage
labelsRepository

...