From 0778b46ad8ea1e04fbdaccf874ade0a00ad7ad75 Mon Sep 17 00:00:00 2001
From: btea <2356281422@qq.com>
Date: Thu, 20 Nov 2025 18:39:35 +0800
Subject: [PATCH] ci: auto remove `conflict pending` label (#22870)

---
 .github/workflows/pr-conflict.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-conflict.yml b/.github/workflows/pr-conflict.yml
index e3c41c0c12..8f75bffce3 100644
--- a/.github/workflows/pr-conflict.yml
+++ b/.github/workflows/pr-conflict.yml
@@ -22,5 +22,19 @@ jobs:
           body: |
             @${{ github.event.pull_request.user.login }} This PR has conflicts, please resolve them.
             <!-- ELEMENT_PLUS_CONFLICT_COMMENT -->
-          body-include: '<!-- ELEMENT_PLUS_CONFLICT_COMMENT -->'
+          body-include: "<!-- ELEMENT_PLUS_CONFLICT_COMMENT -->"
           number: ${{ github.event.pull_request.number }}
+
+  remove-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check mergeable state
+        run: "mergeable_state: ${{ github.event.pull_request.mergeable_state }}"
+      - name: Remove conflict pending label
+        if: |
+          github.repository_owner == 'element-plus' &&
+          github.event.pull_request.mergeable_state == true
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "remove-labels"
+          labels: "conflict pending"