From 4a70e88a761b8bc42a218253f456ef8f25313916 Mon Sep 17 00:00:00 2001
From: Austin Gregg-Smith <blooop@gmail.com>
Date: Sat, 17 Jan 2026 15:49:17 +0000
Subject: [PATCH 1/2] fix pixi issues with merge

---
 scripts/rename_project.sh       | 5 ++++-
 scripts/update_from_template.sh | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/rename_project.sh b/scripts/rename_project.sh
index a6343ce..3951dde 100755
--- a/scripts/rename_project.sh
+++ b/scripts/rename_project.sh
@@ -3,7 +3,10 @@
 mv python_template "$1"
 
 # change project name in all files
-find . \( -type d -name .git -prune \) -o \( -type f -not -name 'tasks.json' -not -name 'update_from_template.sh'  \) -print0 | xargs -0 sed -i "s/python_template/$1/g"
+find . \( -type d -name .git -prune \) -o \( -type f -not -name 'tasks.json' -not -name 'update_from_template.sh' -not -name 'pixi.lock' \) -print0 | xargs -0 sed -i "s/python_template/$1/g"
+
+# regenerate lockfile to match renamed project
+pixi update
 
 # author name
 if [ -n "$2" ]; then
diff --git a/scripts/update_from_template.sh b/scripts/update_from_template.sh
index ebcf97d..d8683e7 100755
--- a/scripts/update_from_template.sh
+++ b/scripts/update_from_template.sh
@@ -6,7 +6,13 @@ git fetch --all
 git checkout main && git pull origin main
 git checkout -B feature/update_from_template; git pull
 git merge template/main --allow-unrelated-histories -m 'feat: pull changes from remote template'
-git checkout --ours pixi.lock; git add pixi.lock
+git checkout --ours pixi.lock
+
+# regenerate lockfile to match merged pyproject.toml
+pixi update
+git add pixi.lock
+git diff --cached --quiet || git commit -m 'chore: update pixi.lock after template merge'
+
 git remote remove template
 git push --set-upstream origin feature/update_from_template
 git checkout main

From 53c15a8518b5496c5a614b1e323e67ca959a78bc Mon Sep 17 00:00:00 2001
From: Austin Gregg-Smith <blooop@gmail.com>
Date: Sat, 17 Jan 2026 15:53:59 +0000
Subject: [PATCH 2/2] bump pixi version

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3bf7ffa..93ac30e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
 
-ARG PIXI_VERSION=v0.62.2
+ARG PIXI_VERSION=v0.63.1
 
 RUN curl -L -o /usr/local/bin/pixi -fsSL --compressed "https://github.com/prefix-dev/pixi/releases/download/${PIXI_VERSION}/pixi-$(uname -m)-unknown-linux-musl" \
     && chmod +x /usr/local/bin/pixi \