Changes between Version 39 and Version 40 of DevelopmentProcedure

Timestamp:

05/02/14 11:09:17 (11 years ago)

Author:

ehansen

Comment:

—

DevelopmentProcedure

@@ -12 +12 @@
   git checkout development
 }}}
-1. If some time passes, before you do anything else, you may need to update your repo.
-{{{
-  git pull
-}}}
 1. Make sure there is a ticket outlining what development you plan on doing.  Create one if necessary!
 1. Then create a new branch off of the development branch using the ticket id as the branch name
@@ -21 +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
 {{{
@@ -35 +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 7-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.
+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 ==