From c6491281e2a70e2eda4587ac6c6b8b4c86ae98ff Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Mon, 24 Jun 2019 16:00:53 +0100 Subject: [PATCH] #1200 remove hotfix line, expnd feature line --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23df7e675..c90c239ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,8 +46,7 @@ Our branching strategy is based on [this article](https://nvie.com/posts/a-succe + **master** a history of releases, once merged to from develop and tagged we create a release on the play store & GitHub releases. + **develop** the actively worked on next release of the app, what we branch off of while working on new features and what we merge into upon feature completion -+ **feature/** or feature// any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted -+ **hotfix/** or hotfix// any branch under this directory is an urgent fix to production, once a hotfix is merged to master (and tagged for release) it must also be merged to develop before being deleted ++ **feature/** or feature// any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted. Typically a feature branch is off of develop and into develop but in rare scenarios if there is an issue in production a branch may be made off master to fix this issue, this type of feature branch must be merged to develop and master before being deleted. All branches should have distinct history and should be visually easy to follow, for this reason only preform merge commits when merging code either by PR or when synchronising.