fix: clean untracked files before pull in deployment workflow

2025-11-10 17:22:50 +00:00
parent 69ca8b77be
commit a5d369625c
1 changed files with 4 additions and 0 deletions
@@ -40,6 +40,10 @@ jobs:
              git stash push -m "Auto-stash before deployment $(date +%Y%m%d-%H%M%S)"
            fi

+            # Clean untracked files to avoid merge conflicts
+            echo "🧹 Cleaning untracked files..."
+            git clean -fd
+
            git pull origin main

            # Reapply stashed changes if any (optional - comment out if not needed)