From c38bd474e1731db5c2b04c64b3924ad1e8a6e3f2 Mon Sep 17 00:00:00 2001
From: Mohmmed Elfateh Sabry <59346303+elfateh4@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:16:33 +0300
Subject: [PATCH] Add step to reset local changes on VPS before deployment

---
 .github/workflows/deploy.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6a5f4fb..02e7ba7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -37,6 +37,19 @@ jobs:
         run: |
           ssh -p "${{ secrets.SSH_PORT }}" "${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}" "sudo mkdir -p '${REMOTE_DIR}' && sudo chown -R \$USER:\$USER '${REMOTE_DIR}'"
 
+      - name: Reset any local changes on VPS
+        run: |
+          ssh -p "${{ secrets.SSH_PORT }}" "${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}" \
+          "export REMOTE_DIR='${{ secrets.REMOTE_DIR }}'; bash -se" <<'EOF'
+          set -euo pipefail
+          cd "$REMOTE_DIR"
+          # Reset any local changes if this is a git repository
+          if [ -d ".git" ]; then
+            git reset --hard HEAD
+            git clean -fd
+          fi
+          EOF
+
       - name: Sync repo to VPS (rsync)
         run: |
           rsync -az --delete \