From 225455a84abf5c72567749cf1c3d10dae59df046 Mon Sep 17 00:00:00 2001
From: juanjosevazquezgil
 <123170708+juanjosevazquezgil@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:19:34 +0200
Subject: [PATCH 1/2] feat: Add trunkBaseDevelopment to
 expander_branch_strategies.tmpl

---
 .../crs_config/expander_branch_strategies.tmpl       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl b/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
index 4a15af1f..dec854b3 100644
--- a/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
+++ b/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
@@ -15,3 +15,15 @@ expanderValues:
             enforceAdmins: false
             requireSignedCommits: true
             requireConversationResolution: false
+    - name: trunkBasedDevelopment
+      values:
+        defaultBranch: {{ or .DefaultBranch "main"}}
+        branchProtections:
+          - branch: {{ or .DefaultBranch "main"}}
+            statusChecks:
+              - "pr_verify"
+            requiredReviewersCount: 1
+            requiredCodeownersReviewers: false
+            enforceAdmins: true
+            requireSignedCommits: true
+            requireConversationResolution: false

From 0a0a1a008a769678689df34de473b9abbbe2962b Mon Sep 17 00:00:00 2001
From: juanjosevazquezgil
 <123170708+juanjosevazquezgil@users.noreply.github.com>
Date: Wed, 22 Jul 2026 13:20:58 +0200
Subject: [PATCH 2/2] Update expander_branch_strategies.tmpl

---
 .../templates/crs_config/expander_branch_strategies.tmpl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl b/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
index dec854b3..f98dbf2c 100644
--- a/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
+++ b/firestartr-bootstrap/templates/crs_config/expander_branch_strategies.tmpl
@@ -22,8 +22,8 @@ expanderValues:
           - branch: {{ or .DefaultBranch "main"}}
             statusChecks:
               - "pr_verify"
-            requiredReviewersCount: 1
+            requiredReviewersCount: 2
             requiredCodeownersReviewers: false
-            enforceAdmins: true
+            enforceAdmins: false
             requireSignedCommits: true
             requireConversationResolution: false