Skip to content

feat(create-and-merge-pull-request): support configurable merge methods - #590

Merged
neilime merged 1 commit into
mainfrom
feat/configurable-create-and-merge-pr-merge-method
Aug 6, 2026
Merged

feat(create-and-merge-pull-request): support configurable merge methods#590
neilime merged 1 commit into
mainfrom
feat/configurable-create-and-merge-pr-merge-method

Conversation

@neilime

@neilime neilime commented Aug 6, 2026

Copy link
Copy Markdown
Member

Summary

This makes actions/create-and-merge-pull-request configurable for repositories that cannot use rebase merges, while keeping the current default behavior unchanged.

Changes

  • add a new merge-method input with merge, rebase, and squash values
  • keep rebase as the default to preserve existing behavior
  • add optional merge-commit-title and merge-commit-message inputs for merge and squash flows
  • document the new inputs in the action README
  • update the root action catalog description to reflect configurable merge behavior

Motivation

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 GitHub

This change lets consumers switch to merge-method: squash while still using the shared action.

Validation

  • reviewed the generated upstream diff after push
  • confirmed the merge flags against gh pr merge --help and GitHub CLI documentation

Notes

This keeps the action opinionated, but removes the hardcoded rebase-only behavior that breaks protected branches with signed-commit requirements.

@github-actions

github-actions Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Super-linter summary

Language Validation result
BIOME_FORMAT Pass ✅
BIOME_LINT Pass ✅
CHECKOV Pass ✅
GITHUB_ACTIONS_ZIZMOR Pass ✅
GITLEAKS Pass ✅
GIT_MERGE_CONFLICT_MARKERS Pass ✅
JSCPD Pass ✅
MARKDOWN Pass ✅
MARKDOWN_PRETTIER Pass ✅
NATURAL_LANGUAGE Pass ✅
PRE_COMMIT Pass ✅
SPELL_CODESPELL Pass ✅
TRIVY Pass ✅
YAML Pass ✅
YAML_PRETTIER Pass ✅

All files and directories linted successfully

For more information, see the GitHub Actions workflow run

Powered by Super-linter

@neilime
neilime force-pushed the feat/configurable-create-and-merge-pr-merge-method branch from 1fc7b4d to a717432 Compare August 6, 2026 13:03
@github-actions

github-actions Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Super-linter summary

Language Validation result
BIOME_FORMAT Pass ✅
BIOME_LINT Pass ✅
CHECKOV Pass ✅
GITHUB_ACTIONS_ZIZMOR Pass ✅
GITLEAKS Pass ✅
GIT_MERGE_CONFLICT_MARKERS Pass ✅
JSCPD Pass ✅
MARKDOWN Pass ✅
MARKDOWN_PRETTIER Pass ✅
NATURAL_LANGUAGE Pass ✅
PRE_COMMIT Pass ✅
SPELL_CODESPELL Pass ✅
TRIVY Pass ✅
YAML Pass ✅
YAML_PRETTIER Pass ✅

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
neilime force-pushed the feat/configurable-create-and-merge-pr-merge-method branch from a717432 to f07e839 Compare August 6, 2026 13:07
@github-actions

github-actions Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Super-linter summary

Language Validation result
BIOME_FORMAT Pass ✅
BIOME_LINT Pass ✅
CHECKOV Pass ✅
GITHUB_ACTIONS_ZIZMOR Pass ✅
GITLEAKS Pass ✅
GIT_MERGE_CONFLICT_MARKERS Pass ✅
JSCPD Pass ✅
MARKDOWN Pass ✅
MARKDOWN_PRETTIER Pass ✅
NATURAL_LANGUAGE Pass ✅
PRE_COMMIT Pass ✅
SPELL_CODESPELL Pass ✅
TRIVY Pass ✅
YAML Pass ✅
YAML_PRETTIER Pass ✅

All files and directories linted successfully

For more information, see the GitHub Actions workflow run

Powered by Super-linter

@neilime
neilime merged commit 3716720 into main Aug 6, 2026
44 checks passed
@neilime
neilime deleted the feat/configurable-create-and-merge-pr-merge-method branch August 6, 2026 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant