gistfile1.txt

Code changes should only be pushed to github if all tests are green.


Below is a common work-flow for a team working with a central repo. 
Several variations are possible, but if unsure, please go by this:

   1. Pull
      $ git pull 
      ... or, if this is your first time ever getting the code, do: 
      $ git clone [email protected]:our_repo/our_repo.git
   2. Run tests. If not all tests pass stop here and investigate. Do not continue to develop until all green.
   3. Switch to your personal branch
      $ git checkout -b my_work   
   4. Do a little coding
   5. Make sure the tests are passing
   6. git commit
   7. repeat steps 4, 5 and 6 as many times as you wish
   8. git checkout master
   9. git pull (you do this at this step in case someone else pushed while you were working)
   10. If that git pull says 'Already up-to-date', proceed to next step, otherwise run tests again
   11. git checkout my_work
   12. git rebase master
   13. git checkout master
   14. git merge my_work
   15. git push

Note on deployments: we use the master branch for deployments