From b227f00f7beda3d8d2298461a09cf3b869a809f8 Mon Sep 17 00:00:00 2001
From: Candace Savonen <cansav09@gmail.com>
Date: Wed, 26 Jun 2024 10:42:40 -0400
Subject: [PATCH] Update render-all.yml

---
 .github/workflows/render-all.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml
index c5e2bc5..d9ef3a7 100644
--- a/.github/workflows/render-all.yml
+++ b/.github/workflows/render-all.yml
@@ -98,7 +98,8 @@ jobs:
           git fetch origin
           git add --force docs/*
           git commit -m 'Render course' || echo "No changes to commit"
-          git pull --rebase --allow-unrelated-histories --strategy-option=ours
+          git pull --rebase --allow-unrelated-histories --strategy-option=ours --autostash
+          git status
           git push -u origin main  || echo "No changes to push"
 
   render-tocless:
@@ -145,7 +146,8 @@ jobs:
           git fetch origin
           git add --force docs/no_toc*
           git commit -m 'Render toc-less' || echo "No changes to commit"
-          git pull --rebase --allow-unrelated-histories --strategy-option=ours
+          git pull --rebase --allow-unrelated-histories --strategy-option=ours --autostash
+          git status
           git push -u origin main  || echo "No changes to push"
 
   render-leanpub:
@@ -192,7 +194,8 @@ jobs:
           git fetch origin
           git add .
           git commit -m 'Delete manuscript folder' || echo "No changes to commit"
-          git pull --rebase --allow-unrelated-histories --strategy-option=ours
+          git pull --rebase --allow-unrelated-histories --strategy-option=ours --autostash
+          git status
           git push -u origin main || echo "No changes to push"
 
       - name: Run ottrpal::bookdown_to_embed_leanpub
@@ -222,7 +225,8 @@ jobs:
           git add --force resources/*
           git add --force docs/*
           git commit -m 'Render Leanpub' || echo "No changes to commit"
-          git pull --rebase --allow-unrelated-histories --strategy-option=ours
+          git status
+          git pull --rebase --allow-unrelated-histories --strategy-option=ours --autostash
           git push --force --set-upstream origin main || echo "No changes to push"
 
   render-coursera:
@@ -267,5 +271,6 @@ jobs:
           git add --force resources/*
           git add --force docs/*
           git commit -m 'Render Coursera quizzes' || echo "No changes to commit"
-          git pull --rebase --allow-unrelated-histories --strategy-option=ours
+          git status
+          git pull --rebase --allow-unrelated-histories --strategy-option=ours --autostash
           git push -u origin main  || echo "No changes to push"