From 8d2d8428e993ef298b405541b178cbf20b7585f9 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 1 Jul 2017 21:26:45 +0100 Subject: [PATCH] Fix inconsistency between summary and specification --- common-flow.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common-flow.md b/common-flow.md index 6f2c46b..9087b78 100644 --- a/common-flow.md +++ b/common-flow.md @@ -42,8 +42,10 @@ Basics: in to the master branch. - New releases are created by committing a version bump commit directly to the master branch, and then tagging that commit with the version. -- Maintenance branches are updated by manually merging and/or back-porting - relevant change branches in to them. +- Maintenance branches are updated by cherry picking relevant changes if + possible, otherwise use a change branch created from the maintenance branch, + and have the pull request target the maintenance branch instead of the master + branch. Git Common-Flow Specification (Common-Flow) -------------------------------------------