Skip to content

Replace custom merge driver with built-in merge=ours #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blooop merged 2 commits into from
Mar 1, 2026
Merged

Replace custom merge driver with built-in merge=ours #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
addbbac
replace custom ourslock merge driver with built-in merge=ours
blooop Mar 1, 2026
3befd20
update pixi.lock
blooop Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .claude/hooks/SessionStart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pixi.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down