Changes between Version 41 and Version 42 of DevelopmentProcedure

Timestamp:

05/02/14 12:14:23 (11 years ago)

Author:

Jonathan

Comment:

Reverted to version 40.

DevelopmentProcedure

@@ -17 +17 @@
   git checkout -b ticket_353 development
 }}}
-1.  Then you can setup your branch to synchronize with the central repository.
+1. Then you can setup your branch to synchronize with the central repository. This will allow you to push commits to your local branch to the central repo for others to see and/or use.
 {{{
   git push -u origin ticket_353
 }}}
-This will allow you to push commits to your local branch to the central repo for others to see and/or use.
-
 1. You can then modify code as necessary and then use git add to add any file changes to your next commit
 {{{
@@ -31 +29 @@
   git commit -m "modified zcooling module to write ztable"
 }}}
+1. Before you push back to the main repo, you should make sure that your branch is still up to date with the latest development branch
+{{{
+  git checkout development
+  git pull
+  git checkout ticket_353
+  git merge development
+}}}
 1. And then you can push those changes to the main repo so they don't get lost
 {{{
   git push
 }}}
-1.  You can repeat steps 6-8 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.
+1. You can repeat steps 6-9 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.
 
 == Merging ==
@@ -91 +96 @@
 1. And then repeat the following steps as needed.
 
-
 [[CollapsibleStart(Previous Procedure)]]