From 06e2f373a121555067c2a788626ad141856c0359 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Sat, 16 Aug 2025 17:22:13 +0800
Subject: [PATCH] Update merge-prs.yml: Filter out conflict-free Pull Requests
 created by bots

---
 .github/workflows/merge-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/merge-prs.yml b/.github/workflows/merge-prs.yml
index e72428c02..3c5e5712e 100644
--- a/.github/workflows/merge-prs.yml
+++ b/.github/workflows/merge-prs.yml
@@ -21,7 +21,7 @@ jobs:
       - name: 获取可合并的 PR
         id: get-prs
         run: |
-          pr_list=$( gh pr list --state open --json number,mergeable --limit 1000 --jq 'sort_by(.number) | .[] | .number' )
+          pr_list=$( gh pr list --state open --author "app/renovate" --json number,mergeStateStatus --limit 1000 --jq 'sort_by(.number) | .[] | select(.mergeStateStatus == "CLEAN") | .number' )
           
           pr_list=$(echo "$pr_list" | tr '\n' ' ')