Changes between Version 31 and Version 32 of DevelopmentProcedure

Timestamp:

03/15/14 20:46:33 (12 years ago)

Author:

Jonathan

Comment:

—

DevelopmentProcedure

@@ -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.
 
-1. Use git to clone the most up to date development 
+1. Before starting a new development task, you should first make sure you have an up to date version of the code.
+{{{
+  git clone ssh://orda@botwin.pas.rochester.edu
+}}}
+
+and then create a new branch off of the development branch
+{{{
+  git checkout -b ticket_353 development
+}}}
+and then synchronize your new branch with the central repository.
+
+{{{
+  git push -u origin ticket_353
+}}}
+
+You can then modify code as necessary and then use git add to add any file changes to your next commit
+{{{
+  git add source/ZCooling.f90 modules/objects/tables.f90
+}}}
+
+
+Then commit your changes locally
+{{{
+  git commit -m "modified zcooling module to write ztable"
+}}}
+
+and then you can push those changes to the main repo
+
+{{{
+  git push
+}}}
+
 
 [[CollapsibleStart(Previous Procedure)]]