Changes between Version 33 and Version 34 of DevelopmentProcedure
- Timestamp:
- 03/18/14 10:07:37 (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DevelopmentProcedure
v33 v34 4 4 AstroBEAR now uses git as the version control system. We also use the [https://www.atlassian.com/git/workflows#!workflow-gitflow GitFlow workflow] for managing development, releases, and bug fixes. Developers should take a minute to read through the [https://www.atlassian.com/git/workflows#!workflow-gitflow GitFlow workflow]. Here is a summary for doing new development. 5 5 6 1. Before starting a new development task, you should first make sure you have an up to date version of the code. 6 1. Before starting a new development task, you should first make sure you have an up to date version of the code. Please see [GitoliteProcess this page] for information about using gitolite. 7 7 {{{ 8 8 git clone ssh://orda@botwin.pas.rochester.edu 9 9 }}} 10 10 11 and then create a new branch off of the development branch11 2. Then create a new branch off of the development branch 12 12 {{{ 13 13 git checkout -b ticket_353 development 14 14 }}} 15 and setup your branch to synchronize with the central repository.16 15 16 3. Then setup your branch to synchronize with the central repository. 17 17 {{{ 18 18 git push -u origin ticket_353 19 19 }}} 20 21 You can then modify code as necessary and then use git add to add any file changes to your next commit 20 4. You can then modify code as necessary and then use git add to add any file changes to your next commit 22 21 {{{ 23 22 git add source/ZCooling.f90 modules/objects/tables.f90 24 23 }}} 25 26 27 Then commit your changes locally 24 5. Then commit your changes locally 28 25 {{{ 29 26 git commit -m "modified zcooling module to write ztable" 30 27 }}} 31 32 and then you can push those changes to the main repo 33 28 6. And then you can push those changes to the main repo so they don't get lost 34 29 {{{ 35 30 git push 36 31 }}} 32 7. You can repeat steps 4-6 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. 37 33 38 39 Once you think the feature is complete and ready for testing, please notify [mailto:astrobear_dev@pas.rochester.edu]40 34 41 35 [[CollapsibleStart(Previous Procedure)]]