Narrow conflict-marker CI check to <<<<<<< and >>>>>>>

2026-09-10 00:11:56 -07:00 · 2026-08-23 23:31:01 +00:00
parent f828c7794a
commit fa7ee0d946
1 changed files with 1 additions and 2 deletions
@@ -13,8 +13,7 @@ jobs:

      - name: Reject merge conflict markers
        run: |
-          if git grep -nE '^(<<<<<<<|>>>>>>>|=======)' -- . \
-            ':(exclude)*.lock' \
+          if git grep -nE '^(<<<<<<<|>>>>>>>)' -- . \
            ':(exclude)package-lock.json'; then
            echo "::error::Merge conflict markers found in tracked files"
            exit 1