master
is always a protected branch — no one can commit or push to it. To contribute changes, branch off of master and make a pull request back to it.- Always
git checkout -b
out ofmaster
. - Once you're happy with your branch and think it's ready for code review, make a PR.
- Make sure the PR title is well written, informative, and as short as possible. Leave out of the title any references to issues — that will go in the description.
- Make sure the PR description gives good information on what changes the PR is introducing. This will both serve for historical purposes, where context is mostly lost, and help code reviewers greatly.
- Add
Fixes #x
orProgress on #y
at the beginning of the PR description, one by line, separated by one empty line from the rest of the description. GitHub will automagically close the referenced issues when the PR is merged. - Make sure the automatic checks are passing (CircleCI, Netlify, etc). Our CI pipeline will run all tests automatically for all submitted pull requests, including linting (npm run lint). You can run
npm run lint:fix
for quick, automatic lint fixes. - Request code review.
- Once the review is approved and checks are passing, your branch will be squash merged by a repo owner.