Apply suggestions from code review

Signed-off-by: Yusuke Kato <[email protected]>
vdaas · Jul 26, 2024 · 466779c · 466779c
1 parent 3b97625
commit 466779c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/check-conflict.yml b/.github/workflows/check-conflict.yml
@@ -35,7 +35,7 @@ jobs:
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: Check conflict
         run: |
-          if grep -r ">>> HEAD" . --exclude-dir=.git --exclude=check-conflict.yml; then
+          if grep -r "<<<< HEAD" . --exclude-dir=.git --exclude=check-conflict.yml; then
             echo "Please fix conflict locally."
             exit 1
           fi