From da4f1303dd9383174b8274d535d754e2fddc398c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 24 Jun 2026 21:41:58 +0000
Subject: [PATCH 1/2] Initial plan


From 266f8ca690ad42edd342c531bafffb6c68305b92 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 24 Jun 2026 21:44:52 +0000
Subject: [PATCH 2/2] ci: fail early when uv.lock has merge markers

---
 .github/workflows/uv-pytests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/uv-pytests.yml b/.github/workflows/uv-pytests.yml
index fe14f19c..fc83d8df 100644
--- a/.github/workflows/uv-pytests.yml
+++ b/.github/workflows/uv-pytests.yml
@@ -26,6 +26,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Validate uv.lock
+        run: |
+          if grep -nE '^(<<<<<<<|=======|>>>>>>>)' uv.lock; then
+            echo "Unresolved merge markers found in uv.lock"
+            exit 1
+          fi
+
       - name: Install the project
         run: uv sync --locked --group test