Changes between Version 33 and Version 34 of DevelopmentProcedure


Ignore:
Timestamp:
03/18/14 10:07:37 (11 years ago)
Author:
Jonathan
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • DevelopmentProcedure

    v33 v34  
    44AstroBEAR 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.
    55
    6 1. Before starting a new development task, you should first make sure you have an up to date version of the code.
     61. 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.
    77{{{
    88  git clone ssh://orda@botwin.pas.rochester.edu
    99}}}
    1010
    11 and then create a new branch off of the development branch
     112. Then create a new branch off of the development branch
    1212{{{
    1313  git checkout -b ticket_353 development
    1414}}}
    15 and setup your branch to synchronize with the central repository.
    1615
     163.  Then setup your branch to synchronize with the central repository.
    1717{{{
    1818  git push -u origin ticket_353
    1919}}}
    20 
    21 You can then modify code as necessary and then use git add to add any file changes to your next commit
     204. You can then modify code as necessary and then use git add to add any file changes to your next commit
    2221{{{
    2322  git add source/ZCooling.f90 modules/objects/tables.f90
    2423}}}
    25 
    26 
    27 Then commit your changes locally
     245. Then commit your changes locally
    2825{{{
    2926  git commit -m "modified zcooling module to write ztable"
    3027}}}
    31 
    32 and then you can push those changes to the main repo
    33 
     286. And then you can push those changes to the main repo so they don't get lost
    3429{{{
    3530  git push
    3631}}}
     327.  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.
    3733
    38 
    39 Once you think the feature is complete and ready for testing, please notify [mailto:astrobear_dev@pas.rochester.edu]
    4034
    4135[[CollapsibleStart(Previous Procedure)]]