From de03f266ba351dfffa924fc94157f318b3f75d35 Mon Sep 17 00:00:00 2001
From: sredny buitrago <sredny@srednys-MacBook-Pro.local>
Date: Thu, 16 Apr 2026 16:36:55 -0400
Subject: [PATCH] enabled automerge on PRs

---
 .github/workflows/release-bot.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-bot.yaml b/.github/workflows/release-bot.yaml
index 31c21a0..f7f13ca 100644
--- a/.github/workflows/release-bot.yaml
+++ b/.github/workflows/release-bot.yaml
@@ -314,7 +314,12 @@ jobs:
                 --body "${BODY}")"
             fi
           fi
-
+          
+          # Enable auto-merge for clean cherry-picks; skip for draft conflict PRs                                                                                                                          
+          if [ "${MERGE_FAILED}" -eq 0 ]; then
+            gh pr merge --auto --merge "${PR_URL}" --repo "${GITHUB_REPO}" || true
+          fi
+      
           # Optionally label the PR if conflicts
           if [ "${MERGE_FAILED}" -ne 0 ]; then
             gh label create "needs-manual-cherry-pick" --color FF8700 --description "Cherry-pick has conflicts" --repo "${GITHUB_REPO}" 2>/dev/null || true