diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 6c476c03..a1b22814 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -83,7 +83,7 @@ jobs: git fetch origin git add --force docs/* git commit -m 'Render bookdown' || echo "No changes to commit" - git pull --set-upstream origin --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-tocless: @@ -122,7 +122,7 @@ jobs: git fetch origin git add --force docs/no_toc* git commit -m 'Render toc-less' || echo "No changes to commit" - git pull --set-upstream origin --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" render-leanpub: @@ -169,7 +169,7 @@ jobs: git fetch origin git add . git commit -m 'Delete manuscript folder' || echo "No changes to commit" - git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push -u origin main || echo "No changes to push" - name: Run ottrpal::bookdown_to_embed_leanpub @@ -199,7 +199,7 @@ jobs: git add --force resources/* git add --force docs/* git commit -m 'Render Leanpub' || echo "No changes to commit" - git pull --allow-unrelated-histories --strategy-option=ours + git pull --rebase --allow-unrelated-histories --strategy-option=ours git push --force --set-upstream origin main || echo "No changes to push" render-coursera: