From 65cbb0cf58e7254fb6b8500b25b9fc4aec912676 Mon Sep 17 00:00:00 2001 From: carlospolop Date: Mon, 29 Sep 2025 16:04:18 +0200 Subject: [PATCH] f --- .github/workflows/auto_merge_approved_prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto_merge_approved_prs.yml b/.github/workflows/auto_merge_approved_prs.yml index a04bf5458..3a567a9fb 100644 --- a/.github/workflows/auto_merge_approved_prs.yml +++ b/.github/workflows/auto_merge_approved_prs.yml @@ -137,7 +137,7 @@ jobs: else echo "Failed to merge PR #$pr_number: $pr_title" fi - elif [ "$pr_mergeable" = "CONFLICTED" ]; then + elif [ "$pr_mergeable" = "CONFLICTED" ] || [ "$pr_mergeable" = "CONFLICTING" ]; then echo "PR #$pr_number has conflicts. Attempting to resolve searchindex.js conflicts..." # Try to resolve conflicts by updating the branch