From 4ab21c9297f75ffd8d953b9e7c198b13df1413fc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:46:01 +0000
Subject: [PATCH 1/3] Initial plan


From 76a2437e492c40a99ef6e2a9af0d55c58d75b5ac Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:48:51 +0000
Subject: [PATCH 2/3] Split conditional actions for auto-merge comments

Co-authored-by: wicksipedia <600044+wicksipedia@users.noreply.github.com>
---
 .../workflows/auto-merge-content-changes.yml    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-merge-content-changes.yml b/.github/workflows/auto-merge-content-changes.yml
index 476719c478..5a26d6eab2 100644
--- a/.github/workflows/auto-merge-content-changes.yml
+++ b/.github/workflows/auto-merge-content-changes.yml
@@ -110,13 +110,22 @@ jobs:
               core.setFailed(`Auto-merge failed: ${error.message}`);
             }
 
-      - name: Comment merge result
+      - name: Comment merge success
         uses: mshick/add-pr-comment@v2
-        if: always()
+        if: steps.auto-merge-pr.outcome == 'success'
         with:
           message: |
-            ${{ steps.auto-merge-pr.outcome == 'success' && '✅ **Auto-merge completed successfully!**' || '❌ **Auto-merge failed** - Please check the workflow logs for details.' }}
+            ✅ **Auto-merge completed successfully!**
             
             This PR was automatically merged as a small content change.
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          allow-repeats: true
\ No newline at end of file
+          allow-repeats: true
+
+      - name: Comment merge failure
+        uses: mshick/add-pr-comment@v2
+        if: steps.auto-merge-pr.outcome == 'failure'
+        with:
+          message: |
+            ❌ **Auto-merge failed** - Please check the workflow logs for details.
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allow-repeats: true

From 6a1c86d891a33de0f697534f01e8496967497330 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:57:19 +0000
Subject: [PATCH 3/3] Move comment steps to separate job for catch-all behavior

Co-authored-by: wicksipedia <600044+wicksipedia@users.noreply.github.com>
---
 .github/workflows/auto-merge-content-changes.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-merge-content-changes.yml b/.github/workflows/auto-merge-content-changes.yml
index 5a26d6eab2..ebaf3d4fcc 100644
--- a/.github/workflows/auto-merge-content-changes.yml
+++ b/.github/workflows/auto-merge-content-changes.yml
@@ -110,9 +110,17 @@ jobs:
               core.setFailed(`Auto-merge failed: ${error.message}`);
             }
 
+  comment-result:
+    name: Comment Merge Result
+    needs: [detect-small-changes, auto-merge]
+    if: always() && needs.detect-small-changes.outputs.is-small-change == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
       - name: Comment merge success
         uses: mshick/add-pr-comment@v2
-        if: steps.auto-merge-pr.outcome == 'success'
+        if: needs.auto-merge.result == 'success'
         with:
           message: |
             ✅ **Auto-merge completed successfully!**
@@ -123,7 +131,7 @@ jobs:
 
       - name: Comment merge failure
         uses: mshick/add-pr-comment@v2
-        if: steps.auto-merge-pr.outcome == 'failure'
+        if: needs.auto-merge.result == 'failure'
         with:
           message: |
             ❌ **Auto-merge failed** - Please check the workflow logs for details.