diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a265caf..152edf3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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