From a5d369625ca2ca62806b701730250676b2f02c33 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 10 Nov 2025 17:22:50 +0000 Subject: [PATCH] fix: clean untracked files before pull in deployment workflow --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7606b87..53b4474 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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)