From 0afbb5efdd98fd3f4a430e0cc2ecd4f4414bce99 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Thu, 12 Feb 2026 15:40:28 -0800 Subject: [PATCH 1/2] Remove auto-merge step from backmerge workflow --- .github/workflows/backmerge-release.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/backmerge-release.yml b/.github/workflows/backmerge-release.yml index b8c92f0d4fc..9b4efe084eb 100644 --- a/.github/workflows/backmerge-release.yml +++ b/.github/workflows/backmerge-release.yml @@ -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 From 42c3908f272a470d72570cd9103d6841a98f80a8 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Thu, 12 Feb 2026 15:41:57 -0800 Subject: [PATCH 2/2] Update PR body to request merge commit instead of auto-merge --- .github/workflows/backmerge-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backmerge-release.yml b/.github/workflows/backmerge-release.yml index 9b4efe084eb..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.*"