Explorar o código

Prevent git pull conflicts on translation files during deploy

unknown hai 2 meses
pai
achega
8d6cf14f28
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      server_update.sh

+ 2 - 1
server_update.sh

@@ -9,7 +9,8 @@ cd $PROJECT_DIR
 
 # 1. Забираем код
 echo "git pull..."
-git checkout package-lock.json # Force clean lockfile to avoid conflicts
+# Force clean generated files and lockfile to avoid conflicts
+git checkout package-lock.json src/locales/translations.admin.json src/locales/translations.user.json
 git pull origin master
 
 # 2. Обновляем зависимости