From 9c9dac86c40d07521b22ec73dd662b85a7764963 Mon Sep 17 00:00:00 2001 From: rancher-max Date: Thu, 23 May 2024 10:59:41 -0700 Subject: [PATCH] Minor updates based on design discussion Signed-off-by: rancher-max --- docs/adrs/008-gh-branch-strategy.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/adrs/008-gh-branch-strategy.md b/docs/adrs/008-gh-branch-strategy.md index c25d881b2f..fedc77f30b 100644 --- a/docs/adrs/008-gh-branch-strategy.md +++ b/docs/adrs/008-gh-branch-strategy.md @@ -1,10 +1,10 @@ -# 5. Branching Strategy in Github +# 8. Branching Strategy in Github -Proposal Date: 2024-05-16 +Proposal Date: 2024-05-23 ## Status -Proposed +Accepted ## Context @@ -16,5 +16,6 @@ All code changes go into the `master` branch. We maintain branches for all curre ## Consequences - Allows for constant development, with code freeze only relevant for the release branches. -- This requires maintaining one additional branch than the current workflow. -- Testing would be more constant from the master branch +- This requires maintaining one additional branch than the current workflow, which also means one additional issue. +- Testing would be more constant from the master branch. +- Minor release captain will have to cut the new branch as soon as they bring in that new minor version.