From f26b382fa68b62b31a1c5a74c678596b816f4e1e Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Thu, 19 Feb 2026 19:39:14 -0800 Subject: [PATCH] reset bun.lock before pulling to prevent merge conflicts during deploy --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 19bf0ba..2d2913a 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -14,7 +14,7 @@ git push origin main ssh "$HOST" DEST="$DEST" APPS_DIR="$APPS_DIR" bash <<'SCRIPT' set -e -cd "$DEST" && git pull origin main && bun install && bun run build +cd "$DEST" && git checkout -- bun.lock && git pull origin main && bun install && bun run build echo "=> Syncing default apps..." for app_dir in "$DEST"/apps/*/; do