Use rebase for auto merge workflow

2024-03-09 09:23:15 -07:00
1 changed files with 1 additions and 1 deletions
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@ -36,7 +36,7 @@ jobs:
    if: ${{ github.actor == 'wbrawner' || github.actor == 'dependabot[bot]' }}
    steps:
      - name: Enable auto-merge
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --rebase "$PR_URL"
        env:
          PR_URL: ${{github.event.pull_request.html_url}}
          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}