Add info on what PRs should be targeted where

2018-08-23 15:30:29 +02:00 · 2018-08-23 15:30:29 +02:00 · addd93b3e5
commit addd93b3e5
parent 97ae9632ba
1 changed files with 4 additions and 0 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -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`