Commit 727f39e
committed
fix: configure ours merge driver for pixi.lock auto-resolve
merge=ours in .gitattributes is not a built-in git merge driver—it
needs an explicit driver definition. Without it, git falls back to the
text driver and reports conflicts on pixi.lock.
Add `git config merge.ours.driver true` to devcontainer postCreateCommand
so the driver is configured on container creation.1 parent baaeac6 commit 727f39e
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
0 commit comments