... | ... | @@ -8,7 +8,7 @@ |
|
|
|
|
|
The Trilinos project uses a long-lived branch called 'develop' to conduct basic development. All Trilinos developers directly pull from and request pulls to the shared github 'develop' branch. Then, the 'master' branch is updated from the 'develop' branch when it passes a specific set of builds for a specific set of packages (the set of packages and builds will evolve over time). This is depicted in the below figure:
|
|
|
|
|
|
![Trilinos Git 'develop'/'master' workflow](https://github.com/trilinos/trilinos_wiki_images/blob/master/GitDevelopMasterWorkflow.png)
|
|
|
![Trilinos Git feature/'develop'/'master' workflow](GitFeatureBranchWorkflow.png)
|
|
|
|
|
|
The motivation for the usage of a 'develop' branch and the full set of mechanics and implications are described in [Addition of a 'develop' branch](https://docs.google.com/document/d/1uVQYI2cmNx09fDkHDA136yqDTqayhxqfvjFiuUue7wo/edit#heading=h.u2ougk1wk7ph).
|
|
|
|
... | ... | |