ci: Fix merge command

HumanSignal · Nov 14, 2023 · b9d7d7a · b9d7d7a
1 parent 711f836
commit b9d7d7a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/git-command.yml b/.github/workflows/git-command.yml
@@ -35,7 +35,9 @@ jobs:
         shell: bash
         run: |
           set -xeuo pipefail
-          if git merge-tree --name-only HEAD origin/$SLASH_COMMAND_ARG_BRANCH | grep 'CONFLICT'; then
+          if git merge-tree --name-only HEAD origin/$SLASH_COMMAND_ARG_BRANCH; then
+            echo "merge_conflict=false" >> $GITHUB_OUTPUT
+          else
             echo "merge_conflict=true" >> $GITHUB_OUTPUT
           fi