Repository navigation
docs(merge-queue): choose a merge method per pull request - #451
Merged
Merged
Conversation
Documents the "Allow choosing a merge method per pull request" setting, the /trunk merge --merge-method flag, the API's mergeMethod field and the GitLab wording, and drops the note that the merge method applies to the whole repository. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Verbatim copy of trunk2 ts/apps/public-api/openapi-v2.json at origin/main
071a40ab9. Picks up isMergeMethodOverrideEnabled on the queue config,
mergeMethod on submit and the queue-entry PATCH, and queueEntry.mergeMethod.
GET/DELETE /v2/tests/{testId}/ticket and the two GET
/v2/tests/{testId}/investigations operations are in the spec but not in the
nav, so they aren't published.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
|
Preview deployment for your docs. Learn more about Mintlify Previews.
|
…ge; re-sync the v2 spec Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…nd refusal behaviour exactly Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
|
Docs PR opened: #457 Added a Merge Queue changelog post about choosing a merge method per pull request, listed on both changelog pages. |
This branch was successfully deployed
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.
Part of TRUNK-23090.
What
Documents choosing a merge method per pull request.
merge-queue/administration/advanced-settings.mdx: new section "Choosing a merge method per pull request": the setting (Settings → General, "Allow choosing a merge method per pull request", off by default), choosing from the web app, the/trunk merge --merge-methodcomment flag and the API, what gets refused, turning it off, and stacks. The queue's dropdown is now named Default merge method, as in the app.It also says where a chosen method shows (the submit button, the PR page badge, and Trunk's PR comment) and that a repository refusing the method at merge time removes the PR with the reason.
merge-queue/reference/common-problems.mdx: removes "The merge method applies to the entire repository, not on a per-PR basis." and points to the new section.merge-queue/using-the-queue/reference.mdx: the comment flag.merge-queue/using-the-queue/api.mdx: a Merge method section (the config field, submit and queue-entry PATCH,null, read-back, refusals) and a 422 example.openapi-v2.json: re-synced verbatim from trunk2ts/apps/public-api/openapi-v2.jsonat main2ba68ba16(re-synced 2026-11-04, after trunk2 #7935 added theMERGE_METHOD_NOT_ALLOWEDfailure reason), the same hand copy as earlier syncs (no automation exists). It is large because the spec had drifted (~1,300 lines ignoring key order); it adds four/v2/tests/{testId}/...operations thatdocs.jsondoesn't list, so they stay unpublished.GitLab is not mentioned, since these docs describe merge queues as GitHub-only. The CLI flag (trunk2 https://github.com/trunk-io/trunk2/pull/7937) isn't documented: docs2 has no page for
trunk mergequeue.🤖 Generated with Claude Code