Oliver/modcomms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto-discard package-lock.json changes before git pull

Browse source 
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 <noreply@anthropic.com>
This commit is contained in:
michael 2025-12-18 10:42:54 -06:00
parent e06dd414c9
commit cc2c68bb02
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deploy.sh
View file

@ -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"