From fd679ef1170428c4f570d565402f184da0d8a192 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 20 Jul 2021 11:10:41 +0100 Subject: [PATCH] Update contributing docs --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0f4096c5..9789e3888 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,6 +46,14 @@ If you raise a pull-request without having signed the CLA, you will be prompted to do so automatically. +### Code Branches + +When raising a PR for a fix or a new feature, it is important to target the right branch. + + - `master` - this is the main branch for the latest stable release of Node-RED. All bug fixes for that release should target this branch. + - `v1.x` - this is the maintenance branch for the 1.x stream. If a fix *only* applies to 1.x, then it should target this branch. If it applies to the current stable release as well, target `master` first. We will then decide if it needs to be back ported to the 1.x stream. + - `dev` - this is the branch for new feature development targeting the next milestone release. + ### Coding standards Please ensure you follow the coding standards used through-out the existing