... | ... | @@ -38,7 +38,7 @@ $ cd Trilinos/ |
|
|
[(develop)]$
|
|
|
```
|
|
|
|
|
|
Once on the local 'develop' branch which is tracking the remote 'origin/develop' branch, simply create a local branch for your new development. changes from develop or your local feature branch can be freely pushed to your fork on github to share with other developers or to simply preserve the code in case of local failuure. When all is ready to integrate simply [issue a pull request on GitHub](https://help.github.com/articles/about-pull-requests/) from your feature branch to trilinos:develop. See [feature branch workflow](VC-%7C-Simple-Centralized-Workflow).
|
|
|
Once on the local 'develop' branch which is tracking the remote 'origin/develop' branch, simply create a local branch for your new development. changes from develop or your local feature branch can be freely pushed to your fork on github to share with other developers or to simply preserve the code in case of local failuure. When all is ready to integrate simply [issue a pull request on GitHub](https://help.github.com/categories/collaborating-with-issues-and-pull-requests/) from your feature branch to trilinos:develop. See [feature branch workflow](VC-%7C-Simple-Centralized-Workflow).
|
|
|
|
|
|
NOTE: The [checkin-test-sems.sh](Policies-%7C-Safe-Checkin-Testing) script can be used on the 'develop' branch to locally test modifications.
|
|
|
|
... | ... | @@ -100,4 +100,4 @@ If one will later want to go back to the local 'develop' branch, then it is a go |
|
|
```
|
|
|
[(develop)]$ git checkout develop
|
|
|
[(develop)]$ git pull
|
|
|
``` |
|
|
``` |
|
|
\ No newline at end of file |