From 521aaa184ec33d0cbfad2af68c8a2ec3b65f160d Mon Sep 17 00:00:00 2001
From: MythEclipse <asepharyanalm001@gmail.com>
Date: Sun, 7 Jun 2026 22:18:17 +0700
Subject: [PATCH] fix: handle local VPS changes during deploy by using git
 reset --hard instead of pull

Switches from git pull --ff-only to git fetch + git reset --hard
origin/main to avoid failing when VPS has uncommitted local changes
to tracked files (apps/ml-service/Dockerfile, docker-compose.yml).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1624c5c..b7b360b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -118,8 +118,8 @@ jobs:
             fi
 
             cd "$DEPLOY_PATH"
-            git checkout main
-            git pull --ff-only origin main
+            git fetch origin main
+            git reset --hard origin/main
 
             {
               printf 'GITHUB_REPOSITORY=%s\n' "$REPO_SLUG"