Update md-html-deploy.yml

brown9804 · Jan 13, 2025 · 0ab0b35 · 0ab0b35
1 parent 0457230
commit 0ab0b35
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/md-html-deploy.yml b/.github/workflows/md-html-deploy.yml
@@ -48,12 +48,14 @@ jobs:
           # Configure Git with a bot email and name
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
-          # Stash any unstaged changes
-          git stash
-          # Pull the latest changes from the remote branch with rebase
-          git pull origin ${{ github.ref }} --rebase
-          # Apply the stashed changes
-          git stash pop
+          # Check for local changes and stash them if present
+          if [ -n "$(git status --porcelain)" ]; then
+            git stash
+            git pull origin ${{ github.ref }} --rebase
+            git stash pop
+          else
+            git pull origin ${{ github.ref }} --rebase
+          fi
           # Add all changes, including untracked files
           git add -A
           # Commit the changes