There are two main branches; master and dev.
| Branch | Purpose |
|---|---|
master |
Production, should never be broken. |
dev |
Staging branch, to protect master and where PRs will be made to. |
s[#]-some-feature-name |
Opened and closed all the time, and merged into dev when code reviewed. |
Before starting a new issue, pull latest into dev (make sure you're in dev).
$ git checkout dev
$ git fetch && git pull
# create new feature branch for sprint 0 (s0)
$ git checkout -b s0-feature-name- Make changes pushing to your branch
- When done open a Pull Request on github
- Merge requires one (or more) approved reviews to go into
dev. If a review requests changes, these changes must be committed and pushed and a new review needs to take place - Once this has been approved and tests are passing, merge to
dev.
Merges to master will take place once per week for all issues that have made into dev for that sprint..
- Need two approved reviews for merge to
master - Finally merge to
master.