From 955328a5f274416f8ef4f0eee4df3bc81cf0a30c Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 1 Jul 2017 14:46:41 +0100 Subject: [PATCH] Updated specification --- common-flow.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common-flow.md b/common-flow.md index 0301049..f25e39b 100644 --- a/common-flow.md +++ b/common-flow.md @@ -46,11 +46,12 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 1. A branch called "master" MUST exist, and it SHOULD be referred to as the - "master branch". The master branch MUST always be in a non-broken state, - meaning it MUST always be in a good enough state that, depending on your - deployment/release flow, a new release can be built from master, or that - master can safely be deployed to production. + "master branch". The master branch MUST always be in a non-broken state, but + MUST be considered to be "bleeding edge". That means the master branch MUST + always be in a good enough state that, depending on your deployment/release + flow, a new release can always be built from master, or that master can + always be safely deployed to production. 2. Changes MUST be performed on a separate branch that SHOULD be referred to as a "change branch". All change branches MUST have descriptive names. You - SHOULD commit locally often, and you MUST regularly push your work to the + SHOULD commit often locally, and you MUST regularly push your work to the same named branch on the remote server.