Use rebase to merge update PRs

shivammathur · Jan 14, 2024 · 936b042 · 936b042
1 parent c0b0e06
commit 936b042
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -31,6 +31,6 @@ jobs:
     - name: Auto approve and merge
       if: steps.cpr.outputs.pull-request-operation == 'created'
       run: |
-        gh pr merge -R "${{ github.repository }}" --merge --auto "${{ steps.cpr.outputs.pull-request-number }}"
+        gh pr merge -R "${{ github.repository }}" --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}