Browse files

edited readme

  • Loading branch information...
ajoslin committed Apr 28, 2012
1 parent 83440ed commit d07c1c97977d1e25211bcf1628a9d1e1dea31677
Showing with 11 additions and 2 deletions.
  1. +11 −2
@@ -1,5 +1,14 @@
-This branch is for work on reading triggers information from a scenario file
+This is the develop branch.
+If you want to work on a new feature, first switch to the develop branch: git checkout develop. Then create a new branch for your feature: git checkout -b my-new-feature. Checking out a new branch while on the develop branch will create your new branch as a child of develop.
+Or if a branch for something exists and you want to switch to it git checkout existing-branch
+To push a branch you're on, do git push origin my-branch
+To pull changes from a branch, do: git fetch origin the-branch-name, then git merge origin/the-branch-name.
+Send me a pull request if you have cool changes you pushed.

0 comments on commit d07c1c9

Please sign in to comment.