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

update pixi.lock

3befd20
Select commit
Loading
Failed to load commit list.
Merged

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

update pixi.lock
3befd20
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar