From 43aadae6ce8addc0503b678d15151d5f6f623485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=86=E9=99=B6?= Date: Sat, 21 Mar 2026 18:44:28 +0800 Subject: [PATCH] fix: correct conflict detection logic in auto-merge workflow --- .github/workflows/auto-merge-feature-branches.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge-feature-branches.yml b/.github/workflows/auto-merge-feature-branches.yml index 722242eec6..946bb75799 100644 --- a/.github/workflows/auto-merge-feature-branches.yml +++ b/.github/workflows/auto-merge-feature-branches.yml @@ -33,10 +33,10 @@ jobs: id: conflict_check run: | git fetch origin main - if ! git merge-tree $(git merge-base HEAD origin/main) HEAD origin/main | grep -q "^changed in both"; then - echo "has_conflict=false" >> $GITHUB_OUTPUT - else + if git merge-tree $(git merge-base HEAD origin/main) HEAD origin/main | grep -q "^changed in both"; then echo "has_conflict=true" >> $GITHUB_OUTPUT + else + echo "has_conflict=false" >> $GITHUB_OUTPUT fi - name: Create conflict issue