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"