From e1d77348fdc4c3b3b542c6fb638a82d4bb145b32 Mon Sep 17 00:00:00 2001 From: Brandon Biete Date: Tue, 13 Jan 2026 12:05:45 -0500 Subject: [PATCH 1/6] [BRE-1360] Update Branching doc for new branch protection rules --- docs/contributing/pull-requests/branching.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/contributing/pull-requests/branching.md b/docs/contributing/pull-requests/branching.md index 36c846520..22832eb0d 100644 --- a/docs/contributing/pull-requests/branching.md +++ b/docs/contributing/pull-requests/branching.md @@ -157,6 +157,15 @@ point. When the release is complete, the `rc` branch is deleted. +### Branch Protection Requirements + +After the initial `rc`, `hotfix-rc`, or `hotfix-rc-*` branch is pushed to GitHub, it becomes +protected. Any additional changes require: + +- All changes must go through pull requests (no direct pushes) +- At least 1 approval required +- Code owner review required + ### Hotfix releases For a hotfix release, a hotfix branch is created off of the release tag for the release upon which @@ -170,7 +179,9 @@ separately, each client in the `clients` repo has their own named hotfix branch: - CLI: `hotfix-rc-cli` Once the hotfix branch has been created, the individual commits in `main` are cherry-picked into the -hotfix branches. For a client fix, this may require cherry-picking to multiple hotfix branches. +hotfix branches. The initial hotfix branch can be pushed directly with the first cherry-pick. Any +additional cherry-picks must be done via pull request due to branch protection. For a client fix, +this may require cherry-picking to multiple hotfix branches. Once the hotfix has been deployed, the hotfix branches are deleted. From 0cc65a15a2c0a6aef573c22b1b08e11467e35ef1 Mon Sep 17 00:00:00 2001 From: brandonbiete Date: Wed, 14 Jan 2026 09:49:31 -0500 Subject: [PATCH 2/6] Update docs/contributing/pull-requests/branching.md Co-authored-by: Matt Bishop --- docs/contributing/pull-requests/branching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing/pull-requests/branching.md b/docs/contributing/pull-requests/branching.md index 22832eb0d..21a6f63a8 100644 --- a/docs/contributing/pull-requests/branching.md +++ b/docs/contributing/pull-requests/branching.md @@ -157,7 +157,7 @@ point. When the release is complete, the `rc` branch is deleted. -### Branch Protection Requirements +### Branch protection requirements After the initial `rc`, `hotfix-rc`, or `hotfix-rc-*` branch is pushed to GitHub, it becomes protected. Any additional changes require: From 2b655fe0ce13a3f81ccd3b8b942e25c886708c64 Mon Sep 17 00:00:00 2001 From: brandonbiete Date: Wed, 14 Jan 2026 09:49:49 -0500 Subject: [PATCH 3/6] Update docs/contributing/pull-requests/branching.md Co-authored-by: Matt Bishop --- docs/contributing/pull-requests/branching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing/pull-requests/branching.md b/docs/contributing/pull-requests/branching.md index 21a6f63a8..611d00d27 100644 --- a/docs/contributing/pull-requests/branching.md +++ b/docs/contributing/pull-requests/branching.md @@ -159,7 +159,7 @@ When the release is complete, the `rc` branch is deleted. ### Branch protection requirements -After the initial `rc`, `hotfix-rc`, or `hotfix-rc-*` branch is pushed to GitHub, it becomes +After the initial `rc`, `hotfix-rc`, or `hotfix-rc-*` branch is pushed to GitHub it becomes protected. Any additional changes require: - All changes must go through pull requests (no direct pushes) From 2e1c89a041a4ce0197abc8fbbd8ca6fa04735c00 Mon Sep 17 00:00:00 2001 From: brandonbiete Date: Wed, 14 Jan 2026 09:50:10 -0500 Subject: [PATCH 4/6] Update docs/contributing/pull-requests/branching.md Co-authored-by: Matt Bishop --- docs/contributing/pull-requests/branching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing/pull-requests/branching.md b/docs/contributing/pull-requests/branching.md index 611d00d27..4bb625151 100644 --- a/docs/contributing/pull-requests/branching.md +++ b/docs/contributing/pull-requests/branching.md @@ -162,7 +162,7 @@ When the release is complete, the `rc` branch is deleted. After the initial `rc`, `hotfix-rc`, or `hotfix-rc-*` branch is pushed to GitHub it becomes protected. Any additional changes require: -- All changes must go through pull requests (no direct pushes) +- Going through pull requests (no direct pushes) - At least 1 approval required - Code owner review required From fc61e18fe7d6f3259267ec8fea9e3a26bec3a7b4 Mon Sep 17 00:00:00 2001 From: brandonbiete Date: Wed, 14 Jan 2026 09:50:22 -0500 Subject: [PATCH 5/6] Update docs/contributing/pull-requests/branching.md Co-authored-by: Matt Bishop --- docs/contributing/pull-requests/branching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing/pull-requests/branching.md b/docs/contributing/pull-requests/branching.md index 4bb625151..dbe2a52e0 100644 --- a/docs/contributing/pull-requests/branching.md +++ b/docs/contributing/pull-requests/branching.md @@ -163,7 +163,7 @@ After the initial `rc`, `hotfix-rc`, or `hotfix-rc-*` branch is pushed to GitHub protected. Any additional changes require: - Going through pull requests (no direct pushes) -- At least 1 approval required +- At least one approval - Code owner review required ### Hotfix releases From 88286a1a5ddadd0f390544e03e5b503f17565740 Mon Sep 17 00:00:00 2001 From: brandonbiete Date: Wed, 14 Jan 2026 09:50:28 -0500 Subject: [PATCH 6/6] Update docs/contributing/pull-requests/branching.md Co-authored-by: Matt Bishop --- docs/contributing/pull-requests/branching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing/pull-requests/branching.md b/docs/contributing/pull-requests/branching.md index dbe2a52e0..778c2abff 100644 --- a/docs/contributing/pull-requests/branching.md +++ b/docs/contributing/pull-requests/branching.md @@ -164,7 +164,7 @@ protected. Any additional changes require: - Going through pull requests (no direct pushes) - At least one approval -- Code owner review required +- Code owner review ### Hotfix releases