Add rebase flag

jhudsl · May 30, 2024 · ceeb113 · ceeb113
1 parent 2a35821
commit ceeb113
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -172,7 +172,7 @@ jobs:
           echo "changes=$changes" >> $GITHUB_OUTPUT
           git add . --force
           git commit -m 'Render preview' || echo "No changes to commit"
-          git pull --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
+          git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
           git push --force || echo "No changes to commit"
         shell: bash