ci: DEV-3261: More strict conflict check (HumanSignal#2890)

SimoneNardi · Sep 1, 2022 · 8972ca9 · 8972ca9
1 parent 6c17fa1
commit 8972ca9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/git-command.yml b/.github/workflows/git-command.yml
@@ -30,7 +30,7 @@ jobs:
           set -xeuo pipefail
           git config --global user.name '${{ github.event.client_payload.github.actor }}'
           git config --global user.email '${{ github.event.client_payload.github.actor }}@users.noreply.github.com'
-          echo "::set-output name=merge_conflict::$(git merge-tree $(git merge-base HEAD origin/$SLASH_COMMAND_ARG_BRANCH) origin/$SLASH_COMMAND_ARG_BRANCH HEAD | egrep '<<')"
+          echo "::set-output name=merge_conflict::$(git merge-tree $(git merge-base HEAD origin/$SLASH_COMMAND_ARG_BRANCH) origin/$SLASH_COMMAND_ARG_BRANCH HEAD | egrep '<<<<<<<')"
 
       - name: Add reaction to command comment on merge conflict
         uses: peter-evans/create-or-update-comment@v2