From 727f39e54c01f7e2998f94f7dd9cdcddc6ee4ee6 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 5 Mar 2026 19:57:56 +0000 Subject: [PATCH] fix: configure ours merge driver for pixi.lock auto-resolve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 591412f..393ef89 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -47,5 +47,5 @@ "source=${localEnv:HOME}/.config/gh,target=/home/vscode/.config/gh,type=bind", "source=${localEnv:HOME}/.claude,target=/home/vscode/.claude,type=bind" ], - "postCreateCommand": "sudo chown vscode .pixi && pixi install" + "postCreateCommand": "sudo chown vscode .pixi && git config merge.ours.driver true && pixi install" }