From 9d965f70739bc3ad7ddf8f8bbd19525c1014416a Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Mon, 23 Dec 2024 13:18:09 -0500
Subject: [PATCH] fix: Update auto-merge.sh

---
 auto-merge/auto-merge.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/auto-merge/auto-merge.sh b/auto-merge/auto-merge.sh
index 827d819..2204730 100644
--- a/auto-merge/auto-merge.sh
+++ b/auto-merge/auto-merge.sh
@@ -20,13 +20,13 @@ merge_pr() {
       # Check if the PR is mergeable
       if jq -e '.mergeable' <<< "$response" > /dev/null; then
           local merge_response=$(curl -s -X PUT -H "Authorization: token $token" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/$REPO/pulls/$pr_number/merge" 2>&1)
-          if [[ "$merge_response" == *"message"* ]]; then
+          if [[ "$merge_response" == *"Pull Request successfully merged"* ]]; then
+            echo "Merged PR #$pr_number"
+            return 0
+          else
             echo "Error merging PR #$pr_number:"
             echo "$merge_response" | jq . 
             sleep 60
-          else
-            echo "Merged PR #$pr_number"
-            return 0
           fi
       else
         echo "PR #$pr_number is not mergeable"