diff --git a/.github/workflows/package-watcher.yaml b/.github/workflows/package-watcher.yaml index 5a4893aa2..adb02bc83 100644 --- a/.github/workflows/package-watcher.yaml +++ b/.github/workflows/package-watcher.yaml @@ -63,6 +63,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase - name: Enable auto-merge for PR if: ${{ fromJSON(env.SHOULD_RUN) && env.LATEST_COMPILER_PACKAGE_TIMESTAMP != '' }} uses: peter-evans/enable-pull-request-automerge@d2ede5636b3febc92809259995e643565e675aab