From addd93b3e532111060f075e57439284cd313b45f Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 23 Aug 2018 15:30:29 +0200 Subject: [PATCH] Add info on what PRs should be targeted where --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e1a5e7c1f3..3a7dca210e 100644 --- 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`