From f828c7794aa10b044968e472ab3ad6be2c99f94a Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 23 Aug 2026 23:30:50 +0000
Subject: [PATCH] Add CI check that fails on merge conflict markers

---
 .github/workflows/ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

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