Merge pull request #146 from blooop/feature/mergedriver

Replace custom merge driver with built-in merge=ours

Author: blooop

.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:"

.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

pixi.lock

@@ -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"