Add CI check that fails on merge conflict markers

2026-09-09 16:01:56 -07:00 · 2026-08-23 23:30:50 +00:00
parent b3f8ef9db3
commit f828c7794a
1 changed files with 11 additions and 0 deletions
@@ -10,6 +10,17 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: Reject merge conflict markers
        run: |
          if git grep -nE '^(<<<<<<<|>>>>>>>|=======)' -- . \
            ':(exclude)*.lock' \
            ':(exclude)package-lock.json'; then
            echo "::error::Merge conflict markers found in tracked files"
            exit 1
          fi
          echo "No conflict markers found"
      - uses: actions/setup-node@v4
        with:
          node-version: "22"