From 466779c379fa6584ff2d7b654588328792951690 Mon Sep 17 00:00:00 2001 From: Yusuke Kato Date: Sat, 27 Jul 2024 05:50:50 +0900 Subject: [PATCH] Apply suggestions from code review Signed-off-by: Yusuke Kato --- .github/workflows/check-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-conflict.yml b/.github/workflows/check-conflict.yml index 5e7b520f94..6eb494b977 100644 --- 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