diff --git a/.github/workflows/backmerge-release.yml b/.github/workflows/backmerge-release.yml index b8c92f0d4fc..0e530c49dfc 100644 --- a/.github/workflows/backmerge-release.yml +++ b/.github/workflows/backmerge-release.yml @@ -77,7 +77,7 @@ jobs: **Commits to merge:** ${{ steps.check.outputs.behind_count }} This PR was created automatically to keep \`main\` up-to-date with release branch changes. - Once approved, it will auto-merge. + Once approved, please merge using a **merge commit** (not squash or rebase). --- *This PR was generated by the [backmerge-release](${{ github.server_url }}/${{ github.repository }}/actions/workflows/backmerge-release.yml) workflow.*" @@ -102,13 +102,6 @@ jobs: echo "Created PR #$PR_NUMBER" fi - - name: Enable auto-merge - if: steps.create-pr.outputs.pull_request_number - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh pr merge ${{ steps.create-pr.outputs.pull_request_number }} --auto --merge - - name: Create issue for merge conflicts if: steps.check.outputs.changes == 'true' && steps.merge.outputs.merge_success == 'false' uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1