From c018fe9f407a21278987e938213b35fbdda0985c Mon Sep 17 00:00:00 2001
From: "jdwlabs-agent-bot[bot]"
 <316811914+jdwlabs-agent-bot[bot]@users.noreply.github.com>
Date: Fri, 2 Oct 2026 06:49:24 +0000
Subject: [PATCH] chore(rulesets): allow only rebase merges

The repo is configured rebase-only, but the ruleset files still allowed
merge and squash. Narrow allowed_merge_methods to rebase, matching the org
baseline, and carry any live-only pull_request setting into the files so
applying them does not silently drop it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Assisted-by: Claude Code:claude-opus-5-5
---
 .github/rulesets/baseline.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/rulesets/baseline.json b/.github/rulesets/baseline.json
index 8d91f681..ea93feb6 100644
--- a/.github/rulesets/baseline.json
+++ b/.github/rulesets/baseline.json
@@ -25,7 +25,8 @@
         },
         "require_last_push_approval": false,
         "required_review_thread_resolution": false,
-        "allowed_merge_methods": ["merge", "squash", "rebase"]
+        "require_extra_approval_for_unattributed_changes": true,
+        "allowed_merge_methods": ["rebase"]
       }
     },
     {