ACME plans to make extensive use of the 'git subtree' capability for components which are also developed by other organizations outside ACME. The use of git subtree allows most ACME development to take place within the ACME repository, in a seamless manor with no knowledge of the fact that the code may or may not part of a subtree. But the use of a subtree allows ACME, when necessary, to use git merge utilities, to bring in new code from the external repository or share ACME code with the external repository.
This page is for integrators who will be bringing in code or changes to code from an external repository. This page describes the process where the code will be integrated into the ACME repository as a git subtree. There are four possible workflows; Inserting two workflows related to creating the initial git subtree within ACME: Inserting in a new external into ACME as a subtree, replacing original ACME code with an external subtree, merging . There are two workflows for working with an established git subtree: merging in changes from an external into an ACME subtree, and pulling changes from an ACME subtree to merge back to an external. Each workflow is outlined below followed by sections showing details for various workflow step types. Read the conditions at the top of each workflow to be sure to choose the correct one.
...