Fix server deploy: git reset --hard to avoid merge conflicts

2026-06-25 17:12:08 +03:00
parent 306002bfa1
commit 532351e1c9
2 changed files with 9 additions and 3 deletions
@@ -4,7 +4,9 @@ set -euo pipefail
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "${ROOT_DIR}"

-git pull origin main
+git fetch origin main
+git reset --hard origin/main
+chmod +x scripts/*.sh 2>/dev/null || true

 export APP_VERSION=$(git describe --tags --always 2>/dev/null || git rev-parse --short HEAD)
 export BUILD_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)