From 3b3ab21c771876e1e2fcf4149d62789dbeaecc8e Mon Sep 17 00:00:00 2001 From: Jan M Michalski Date: Fri, 13 Aug 2021 13:27:25 +0200 Subject: [PATCH] CONTRIBUTING.md: update the pull requests procedure Ref: #175 --- CONTRIBUTING.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index db239bc6..03d120a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,10 +24,12 @@ For larger changes, please file an issue to discuss making larger enhancements. When submitting a pull request: -1. Rebase to the testing branch -2. Sign off on the commit - -Accepted pull requests will not be directly merged via GitHub. They will be -be merged internally for further review before being pushed to the testing -branch. Commits may be subject to minor changes. After a validation cycle, it +1. Pick the target branch + - `master` - the latest stable release + - `master_N_0` - the stable branch of the respective 0N.00.00.xxxx release + - `development` - the development branch of the future release +2. Rebase to the target branch +3. Sign off on the commit + +Commits may be subject to minor changes. After a validation cycle, it will merged into master under a tagged release.