Skip to content
Lynn Foster edited this page Dec 20, 2015 · 1 revision

We decided to use the branch-and-pull-request method for the code.

From the "GitHub Flow" workflow

  • Anything in the master branch is deployable
  • To work on something new, create a descriptively named branch off of master (i.e. fairy-princess-use-case)
  • 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

Other documentation - md files, wiki, designs, etc. - can be edited in place and committed directly.

References:

https://help.github.com/articles/working-with-forks/

Especially:

Clone this wiki locally