Changes between Version 34 and Version 35 of DevelopmentProcedure
- Timestamp:
- 03/24/14 11:37:14 (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DevelopmentProcedure
v34 v35 8 8 git clone ssh://orda@botwin.pas.rochester.edu 9 9 }}} 10 11 2. Then create a new branch off of the development branch 10 1. Also make sure there is a ticket outlining what development you plan on doing. Create one if necessary! 11 1. Then create a new branch off of the development branch using the ticket id as the branch name 12 12 {{{ 13 13 git checkout -b ticket_353 development 14 14 }}} 15 16 3. Then setup your branch to synchronize with the central repository. 15 1. Then setup your branch to synchronize with the central repository. 17 16 {{{ 18 17 git push -u origin ticket_353 19 18 }}} 20 4. You can then modify code as necessary and then use git add to add any file changes to your next commit19 1. You can then modify code as necessary and then use git add to add any file changes to your next commit 21 20 {{{ 22 21 git add source/ZCooling.f90 modules/objects/tables.f90 23 22 }}} 24 5. Then commit your changes locally23 1. Then commit your changes locally 25 24 {{{ 26 25 git commit -m "modified zcooling module to write ztable" 27 26 }}} 28 6. And then you can push those changes to the main repo so they don't get lost27 1. And then you can push those changes to the main repo so they don't get lost 29 28 {{{ 30 29 git push 31 30 }}} 32 7. You can repeat steps 4-6as many times as you want until the feature is complete. Then please notify [mailto:astrobear_dev@pas.rochester.edu] and we will merge your changes into the development branch and the next release.31 1. You can repeat steps 5-7 as many times as you want until the feature is complete. Then please notify [mailto:astrobear_dev@pas.rochester.edu] and we will merge your changes into the development branch and the next release. 33 32 34 33