Try another strategy

jhudsl · May 24, 2023 · 64f6b5e · 64f6b5e
1 parent e57817c
commit 64f6b5e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml
@@ -187,8 +187,7 @@ jobs:
           git add --force resources/*
           git add --force docs/*
           git commit -m 'Render Leanpub' || echo "No changes to commit"
-          git fetch 
-          git push --force origin main || echo "No changes to push"
+          git push --force --set-upstream origin main || echo "No changes to push"
 
   render-coursera:
     name: Finish Coursera prep
@@ -227,5 +226,4 @@ jobs:
           git add --force resources/*
           git add --force docs/*
           git commit -m 'Render Coursera quizzes' || echo "No changes to commit"
-          git pull --allow-unrelated-histories --strategy-option=ours
-          git push origin main || echo "No changes to push"
+          git push --force --set-upstream origin main || echo "No changes to push"