feat(create-and-merge-pull-request): support configurable merge methods - #590
Merged
Merged
Conversation
Contributor
Super-linter summary
All files and directories linted successfully For more information, see the GitHub Actions workflow run Powered by Super-linter |
neilime
force-pushed
the
feat/configurable-create-and-merge-pr-merge-method
branch
from
August 6, 2026 13:03
1fc7b4d to
a717432
Compare
Contributor
Super-linter summary
All files and directories linted successfully For more information, see the GitHub Actions workflow run Powered by Super-linter |
Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>
neilime
force-pushed
the
feat/configurable-create-and-merge-pr-merge-method
branch
from
August 6, 2026 13:07
a717432 to
f07e839
Compare
Contributor
Super-linter summary
All files and directories linted successfully For more information, see the GitHub Actions workflow run Powered by Super-linter |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This makes
actions/create-and-merge-pull-requestconfigurable for repositories that cannot use rebase merges, while keeping the current default behavior unchanged.Changes
merge-methodinput withmerge,rebase, andsquashvaluesrebaseas the default to preserve existing behaviormerge-commit-titleandmerge-commit-messageinputs for merge and squash flowsMotivation
On repositories that require signed commits on the base branch, GitHub refuses automatic rebase merges with errors like:
GraphQL: Base branch requires signed commits. Rebase merges cannot be automatically signed by GitHubThis change lets consumers switch to
merge-method: squashwhile still using the shared action.Validation
gh pr merge --helpand GitHub CLI documentationNotes
This keeps the action opinionated, but removes the hardcoded rebase-only behavior that breaks protected branches with signed-commit requirements.