From a79db7c99518f9862cc8db15f80052685c9bad3b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Jul 2026 11:39:16 +0000
Subject: [PATCH 1/2] Initial plan


From dc5d2de78bff1d18414aa996acecf20dd2d57d72 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Jul 2026 11:41:08 +0000
Subject: [PATCH 2/2] ci: fall back to direct merge when auto-merge requires
 branch protection

---
 .github/workflows/promote-main-to-release-candidate.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/promote-main-to-release-candidate.yml b/.github/workflows/promote-main-to-release-candidate.yml
index c015598..5e81e33 100644
--- a/.github/workflows/promote-main-to-release-candidate.yml
+++ b/.github/workflows/promote-main-to-release-candidate.yml
@@ -56,7 +56,10 @@ jobs:
             exit 0
           fi
 
-          gh pr merge "$PR_NUMBER" --auto --merge
+          if ! gh pr merge "$PR_NUMBER" --auto --merge 2>/dev/null; then
+            # Auto-merge requires branch protection rules; fall back to direct merge
+            gh pr merge "$PR_NUMBER" --merge
+          fi
 
       - name: Ask Copilot to resolve merge conflicts
         if: steps.merge.outputs.conflicting == 'true' || failure()