Skip to content

Commit 727f39e

Browse files
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

File tree

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@
4747
"source=${localEnv:HOME}/.config/gh,target=/home/vscode/.config/gh,type=bind",
4848
"source=${localEnv:HOME}/.claude,target=/home/vscode/.claude,type=bind"
4949
],
50-
"postCreateCommand": "sudo chown vscode .pixi && pixi install"
50+
"postCreateCommand": "sudo chown vscode .pixi && git config merge.ours.driver true && pixi install"
5151
}

0 commit comments

Comments
 (0)