diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 6feb3d7..e113b15 100644 --- 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 }}