Our github workflow

The way we collaborate is pretty simple as we follow the same workflow as github themselves

A quick summery:

• Anything in the master branch is deployable

• To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)

• Commit to that branch locally and regularly push your work to the same named branch on the server

• When you need feedback or help, or you think the branch is ready for merging, open a pull request

• After someone else has reviewed and signed off on the feature, you can merge it into master

• Once it is merged and pushed to ‘master’, you can and should deploy immediately

more: https://gist.github.com/jbenet/ee6c9ac48068889b0912