- Read the git flow branching model
- If you do not have collaborator access, fork the repo
- Cut a namespaced branch
- Feature branches are cut from
develop
-feature-<name>-#<issueNumber>
- Hotfix branches are cut from
master
-hotfix-<name>
- Make commits to your feature branch. Commits are written in present tense.
- When you've finished with your fix or feature, Rebase upstream changes into your branch.
- Follow directions in the Git Flow wiki page.
- Submit a pull request to the branch from which yours was cut (i.e.
master
forhotfix
, ordevelop
forfeature
. Include a description of your changes. - In most cases, your branch should not break TODO: the build. You can run build tests on your local machine with
npm test
. If your branch does not pass specs, explain why in your pull request. - Your pull request will be reviewed by another maintainer.
- Fix any issues raised by your code reviwer, and push your fixes as a single new commit.
- Once the pull request has been reviewed, it will be merged by the Scrum Master. The Scrum Master may choose to delegate review and merging of pull requests to other collaborators.