... | @@ -5,4 +5,4 @@ The following links provide information on Trilinos version control processes an |
... | @@ -5,4 +5,4 @@ The following links provide information on Trilinos version control processes an |
|
* Use the [simple centralized workflow](https://github.com/trilinos/Trilinos/wiki/VC-|-Simple-Centralized-Workflow) to integrate and push changes to a shared remote tracking branch (i.e. the 'develop' branch)
|
|
* Use the [simple centralized workflow](https://github.com/trilinos/Trilinos/wiki/VC-|-Simple-Centralized-Workflow) to integrate and push changes to a shared remote tracking branch (i.e. the 'develop' branch)
|
|
* For typical development, most developers will checkout, make changes, and push Trilinos changes to the ['develop' branch](https://github.com/trilinos/Trilinos/wiki/VC-|-'develop'-'master'-workflow).
|
|
* For typical development, most developers will checkout, make changes, and push Trilinos changes to the ['develop' branch](https://github.com/trilinos/Trilinos/wiki/VC-|-'develop'-'master'-workflow).
|
|
* To fix defects on a release branch, use the [release branch merge workflow](???).
|
|
* To fix defects on a release branch, use the [release branch merge workflow](???).
|
|
* Use the tools gitdist and checkin-test.py to help work with [Trilinos and extra repositories](???) (e.g. [inserted packages](https://docs.google.com/document/d/1fLSz7FM8hzmIfr84jQ9B9-C7eXhdLBu0aUyXfKS3XCU/edit#bookmark=id.nnw9n1fjkn34) like Sundance, CTrilinos, ForTrilinos, Mesquite and MOOCHO as well as [extra packages](https://docs.google.com/document/d/1fLSz7FM8hzmIfr84jQ9B9-C7eXhdLBu0aUyXfKS3XCU/edit#bookmark=id.x7n2akjjfrim) in repos like preCoprightTrilinos). |
|
* Use the tools gitdist and checkin-test.py to help work with [Trilinos and extra repositories](???) (e.g. [inserted packages](https://docs.google.com/document/d/1fLSz7FM8hzmIfr84jQ9B9-C7eXhdLBu0aUyXfKS3XCU/edit#bookmark=id.nnw9n1fjkn34) like Sundance, CTrilinos, ForTrilinos, Mesquite and MOOCHO as well as [extra packages](https://docs.google.com/document/d/1fLSz7FM8hzmIfr84jQ9B9-C7eXhdLBu0aUyXfKS3XCU/edit#bookmark=id.x7n2akjjfrim) in repos like preCopyrightTrilinos). |
|
\ No newline at end of file |
|
\ No newline at end of file |