From c6ee479f66e4183d4a7f16025e925b77da88aa36 Mon Sep 17 00:00:00 2001 From: Candace Savonen Date: Wed, 5 Jun 2024 16:10:21 -0400 Subject: [PATCH] Hot Fix for rebase --- .github/workflows/render-all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index a93ce19d..ffcaa641 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 --rebase --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" 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 --rebase --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" render-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 --rebase --set-upstream origin $branch_name --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: @@ -244,5 +244,5 @@ jobs: git add --force resources/* git add --force docs/* git commit -m 'Render Coursera quizzes' || echo "No changes to commit" - git pull --rebase --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"