瀏覽代碼

fix(deploy): force checkout package-lock before pull to avoid merge conflicts

unknown 17 小時之前
父節點
當前提交
fe6346bbfc
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      server_update.sh

+ 1 - 0
server_update.sh

@@ -7,6 +7,7 @@ cd $PROJECT_DIR
 
 # 1. Забираем код
 echo "git pull..."
+git checkout package-lock.json # Force clean lockfile to avoid conflicts
 git pull origin master
 
 # 2. Собираем фронтенд