From 849d11e47884ee52d6b5d52f7675caafecceea1f Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Thu, 3 May 2018 14:06:07 +0100 Subject: [PATCH] Move up Summary section above Terminology --- common-flow.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common-flow.md b/common-flow.md index cc04983..9e9a645 100644 --- a/common-flow.md +++ b/common-flow.md @@ -14,6 +14,20 @@ In short, Common-Flow is essentially GitHub Flow with the addition of versioned releases, optional release branches, and without the requirement to deploy to production all the time. +Summary +------- + +- The "master" branch is the mainline branch with latest changes, and must not + be broken. +- Changes (features, bugfixes, etc.) are done on "change branches" created from + the master branch. +- Rebase change branches [early and often](https://i.imgur.com/1RS8x2d.png). +- When a change branch is stable and ready, it is merged back in to master. +- A release is just a git tag who's name is the exact release version string + (e.g. "2.11.4"). +- Release branches can be used to avoid a change freezes on master. They are not + required, instead they are available if you need them. + Terminology ----------- @@ -34,20 +48,6 @@ Terminology - **Release Branches** - Used both for short-term preparations of a release, and also for long-term maintenance of older version. -Summary -------- - -- The "master" branch is the mainline branch with latest changes, and must not - be broken. -- Changes (features, bugfixes, etc.) are done on "change branches" created from - the master branch. -- Rebase change branches [early and often](https://i.imgur.com/1RS8x2d.png). -- When a change branch is stable and ready, it is merged back in to master. -- A release is just a git tag who's name is the exact release version string - (e.g. "2.11.4"). -- Release branches can be used to avoid a change freezes on master. They are not - required, instead they are available if you need them. - Git Common-Flow Specification (Common-Flow) -------------------------------------------