Skip to content

Commit

Permalink
Minor updates based on design discussion
Browse files Browse the repository at this point in the history
Signed-off-by: rancher-max <[email protected]>
  • Loading branch information
rancher-max committed May 23, 2024
1 parent 3773ebb commit 734f590
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions docs/adrs/008-gh-branch-strategy.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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.

0 comments on commit 734f590

Please sign in to comment.