Changes between Version 46 and Version 47 of DevelopmentProcedure

Timestamp:

05/14/15 15:33:19 (10 years ago)

Author:

Jonathan

Comment:

—

DevelopmentProcedure

@@ -35 +35 @@
 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
+  git merge origin/development
 }}}
 1. And then you can push those changes to the main repo so they don't get lost