From cc2c68bb026cbcb17d1f97f7b46868ce7a3f4bed Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 18 Dec 2025 10:42:54 -0600 Subject: [PATCH] Auto-discard package-lock.json changes before git pull MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package-lock.json changes when npm install runs on different platforms/npm versions. Since deploy.sh runs npm install anyway, discard local changes to this file before pulling to avoid conflicts. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy.sh b/deploy.sh index 28c6c7d..435c74a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -86,6 +86,8 @@ echo "" echo "[1/6] Updating code..." if [ -d .git ]; then if git remote -v | grep -q origin; then + # Discard local changes to package-lock.json (regenerated by npm install anyway) + git checkout -- frontend/package-lock.json 2>/dev/null || true git pull || echo "Warning: git pull failed, continuing with local code" else echo " No remote configured, skipping git pull"