Changes between Version 34 and Version 35 of DevelopmentProcedure


Ignore:
Timestamp:
03/24/14 11:37:14 (11 years ago)
Author:
Jonathan
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • DevelopmentProcedure

    v34 v35  
    88  git clone ssh://orda@botwin.pas.rochester.edu
    99}}}
    10 
    11 2. Then create a new branch off of the development branch
     101. Also make sure there is a ticket outlining what development you plan on doing.  Create one if necessary!
     111. Then create a new branch off of the development branch using the ticket id as the branch name
    1212{{{
    1313  git checkout -b ticket_353 development
    1414}}}
    15 
    16 3.  Then setup your branch to synchronize with the central repository.
     151.  Then setup your branch to synchronize with the central repository.
    1716{{{
    1817  git push -u origin ticket_353
    1918}}}
    20 4. You can then modify code as necessary and then use git add to add any file changes to your next commit
     191. You can then modify code as necessary and then use git add to add any file changes to your next commit
    2120{{{
    2221  git add source/ZCooling.f90 modules/objects/tables.f90
    2322}}}
    24 5. Then commit your changes locally
     231. Then commit your changes locally
    2524{{{
    2625  git commit -m "modified zcooling module to write ztable"
    2726}}}
    28 6. And then you can push those changes to the main repo so they don't get lost
     271. And then you can push those changes to the main repo so they don't get lost
    2928{{{
    3029  git push
    3130}}}
    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.
     311.  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.
    3332
    3433