... | ... | @@ -19,7 +19,7 @@ For those developers more comfortable with git, all one needs to do is: |
|
|
* Pull from, make changes on, and push to the 'develop' branch instead of the 'master' branch (see [details](centralized_develop_workflow))
|
|
|
* If changes are accidentally made to the local 'master' branch, then merge the local 'master' branch to the local 'develop' branch and reset the local 'master' branch to 'origin/master' (see [details](transition_to_develop)).
|
|
|
|
|
|
If a developer understands the above, then they don't need to read any more on this page. However, if a developer is not clear what is required, then the rest of this page contains the exact detailed information that an average Trilinos developer needs to know in order to transition to and use the 'develop' branch as well as make commits on the local 'develop' branch and push to the shared 'develop' branch. Performing these tasks does not require advanced usage of git. All required commands and steps are described in detail below.
|
|
|
If a developer understands the above, then they don't need to read any more on this page. However, if a developer is not clear what is required, then the rest of this page contains the exact detailed information that an typical Trilinos developer needs to know in order to transition to and use the 'develop' branch as well as make commits on the local 'develop' branch and push to the shared 'develop' branch. Performing these tasks does not require advanced usage of git. All required commands and steps are described in detail below.
|
|
|
|
|
|
(NOTE: The "bug-fix" workflow elements shown in the above figure are not described below but are described in great detail the above reference. If things go well, then these "bug fix" commits should almost never be needed. But in the rare cases these "bug-fix" commits or revert commits are needed/desired, then more experienced Trilinos git developers can help make those changes.)
|
|
|
|
... | ... | |