Skip to content

Remove auto-merge step from backmerge workflow #14481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joperezr merged 2 commits into from
Feb 13, 2026
Merged

Remove auto-merge step from backmerge workflow #14481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0afbb5e
Remove auto-merge step from backmerge workflow
joperezr Feb 12, 2026
42c3908
Update PR body to request merge commit instead of auto-merge
joperezr Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/backmerge-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Expand All @@ -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
Expand Down
Loading