Skip to content

Commit

Permalink
Add info on what PRs should be targeted where
Browse files Browse the repository at this point in the history
  • Loading branch information
cwgoes committed Aug 23, 2018
1 parent 97ae963 commit addd93b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ Ensure that you base and target your PR on the correct branch:
- `master` for a merge of a release
- `develop` in the usual case

All feature additions should be targeted against `develop`. Bug fixes for an outstanding release candidate
should be targeted against the release candidate branch. Release candidate branches themselves should be the
only pull requests targeted directly against master.

### Development Procedure:
- the latest state of development is on `develop`
- `develop` must never fail `make test` or `make test_cli`
Expand Down

0 comments on commit addd93b

Please sign in to comment.