From addbbacb34fb4b19eb4ae9ef4ac18140f6b94ef7 Mon Sep 17 00:00:00 2001
From: Austin Gregg-Smith <blooop@gmail.com>
Date: Sun, 1 Mar 2026 16:25:59 +0000
Subject: [PATCH 1/2] replace custom ourslock merge driver with built-in
 merge=ours

The custom merge driver required per-clone git config setup which was
fragile. Git's built-in merge=ours driver works from .gitattributes
alone with zero local configuration.
---
 .claude/hooks/SessionStart | 4 ----
 .gitattributes             | 2 +-
 pyproject.toml             | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.claude/hooks/SessionStart b/.claude/hooks/SessionStart
index 215bf16..5236120 100755
--- a/.claude/hooks/SessionStart
+++ b/.claude/hooks/SessionStart
@@ -34,10 +34,6 @@ pixi install
 echo "🔧 Setting up prek hooks..."
 pixi run prek install || echo "⚠️  Prek installation skipped (optional)"
 
-# Set up git merge driver for lockfiles
-echo "🔧 Configuring git merge driver..."
-pixi run setup-git-merge-driver || true
-
 echo "✅ Environment setup complete!"
 echo ""
 echo "Available pixi tasks:"
diff --git a/.gitattributes b/.gitattributes
index e507580..311c32a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -43,4 +43,4 @@
 # numpy file format
 *.npy filter=lfs diff=lfs merge=lfs -text
 # GitHub syntax highlighting
-pixi.lock linguist-language=YAML merge=ourslock
+pixi.lock linguist-language=YAML merge=ours
diff --git a/pyproject.toml b/pyproject.toml
index 57a3dc7..903a9ce 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -98,7 +98,6 @@ ci = { depends-on = [
 ci-push = { depends-on = ["format", "ruff-lint", "update-lock", "ci", "push"] }
 clear-pixi = "rm -rf .pixi pixi.lock"
 ralph = "ralph"
-setup-git-merge-driver = "git config merge.ourslock.driver true"
 update-from-template-repo = "./scripts/update_from_template.sh"
 dev-use-prebuilt = "./scripts/devcontainer_use_prebuilt.sh"
 dev-use-local = "./scripts/devcontainer_use_local.sh"

From 3befd20184902f7d24d55b0a28a19254e4b1d886 Mon Sep 17 00:00:00 2001
From: Austin Gregg-Smith <blooop@gmail.com>
Date: Sun, 1 Mar 2026 16:26:38 +0000
Subject: [PATCH 2/2] update pixi.lock

---
 pixi.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixi.lock b/pixi.lock
index a77f103..a0efff9 100644
--- a/pixi.lock
+++ b/pixi.lock
@@ -883,7 +883,7 @@ packages:
 - pypi: ./
   name: python-template
   version: 0.2.0
-  sha256: 3c39f0339b9f9a48257dbbcd88fe4a65363187b4ad866ac1f353cfce4144b443
+  sha256: acd5064f3b5d5b49096fa258d515a3d9d1eeb600f8d84fa08720b886965ee68e
   requires_dist:
   - pylint>=3.2.5,<=4.0.5 ; extra == 'test'
   - pytest-cov>=4.1,<=7.0.0 ; extra == 'test'