|
|
@@ -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. Обновляем зависимости
|