From 068ce9e751eedcf3ada721c011ec8841e86635ec Mon Sep 17 00:00:00 2001 From: Joel Collins <2579603-jtc42@users.noreply.gitlab.com> Date: Tue, 7 May 2019 11:06:42 +0000 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 06230d01..1214131d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,21 +5,20 @@ email, or any other method with the owners of this repository before making a ch Please note we have a working flow, and a code of conduct. Please follow it in all your interactions with the project. -## Development flow +## Flow -* Master is the latest working version, always +### Development -* We shouldn't be pushing to Master directly +* Master is the latest working version, always. +* Do not push to Master directly. +* New features should be developed on branches (or forks), and merged. +* Bugfixes likewise should be developed in branches. -* New features should be developed on branches and merged - -* Bugfixes likewise should be done in branches +### Releases * Once we've merged a few things in and want to make a release, we tag it on master. -Not every commit on master will get a tag, we'll accumulate a few changes before making a release, unless there's a reason to release straight away. - -* As and when v2 appears, we will move v1 to a branch in case we want to push out bugfixes, -but we're not likely to do this for minor versions/feature releases. +* Not every commit on master will get a tag, we'll accumulate a few changes before making a release, unless there's a reason to release straight away. +* As and when 2.x.x appears, we will move 1.x.x to a branch in case we want to push out bugfixes, but we're not likely to do this for minor releases. ## Code of Conduct