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

Add CI check that fails on merge conflict markers
Fix conflict markers on main and guard CI against them
2026-09-10 00:11:56 -07:00 · 2026-08-23 23:31:01 +00:00 · 2026-08-23 23:30:50 +00:00 · 2026-08-23 23:30:43 +00:00 · 2026-08-23 16:10:30 -07:00
1 changed files with 10 additions and 0 deletions
@@ -10,6 +10,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
+
+      - name: Reject merge conflict markers
+        run: |
+          if git grep -nE '^(<<<<<<<|>>>>>>>)' -- . \
+            ':(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"
Author	SHA1	Message	Date
Cursor Agent	fa7ee0d946	Narrow conflict-marker CI check to <<<<<<< and >>>>>>>	2026-08-23 23:31:01 +00:00
Cursor Agent	f828c7794a	Add CI check that fails on merge conflict markers	2026-08-23 23:30:50 +00:00
Cursor Agent	b3f8ef9db3	Fix conflict markers on main and guard CI against them PR #2 merged before the Dockerfile cleanup landed, leaving <<<<<<< markers that break docker compose build. Restore clean Docker files and fail CI if conflict markers appear in the tree.	2026-08-23 23:30:43 +00:00
Nick TrochalakisandCursor Agent	d3ed4566b7	RFID tag dump PWA + REST API (with Docker Compose) (#2 ) * Implement RFID tag dump PWA with REST API, auth, and CI Add Next.js app with SQLite/Drizzle storage for sites and LF/HF tag dumps, multi-user Auth.js (credentials + optional OIDC), personal API tokens in Settings, versioned /api/v1 for UI and future CLI use, MCT/Proxmark/JSON import-export, PWA offline shell, Vitest tests, and GitHub Actions CI. * Add Docker Compose setup with persistent volume Improve the production Dockerfile (healthcheck, entrypoint bootstrap user, pruned deps) and add docker-compose.yml plus .dockerignore for one-command deploy with a named SQLite volume. --------- Co-authored-by: Cursor Agent <[email protected]>	2026-08-23 16:10:30 -07:00