From 3644334f57a9b11f74a9c9281aa62492b0abf37f Mon Sep 17 00:00:00 2001 From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 20:50:33 +0000 Subject: [PATCH] docs: add changelog entry for Merge Queue per-PR merge method --- ...-11-04-merge-queue-per-pr-merge-method.mdx | 20 +++++++++++++++++++ changelog/index.mdx | 6 ++++++ docs.json | 1 + merge-queue/changelog.mdx | 8 ++++++++ 4 files changed, 35 insertions(+) create mode 100644 changelog/2026-11-04-merge-queue-per-pr-merge-method.mdx diff --git a/changelog/2026-11-04-merge-queue-per-pr-merge-method.mdx b/changelog/2026-11-04-merge-queue-per-pr-merge-method.mdx new file mode 100644 index 00000000..81a0c0f8 --- /dev/null +++ b/changelog/2026-11-04-merge-queue-per-pr-merge-method.mdx @@ -0,0 +1,20 @@ +--- +title: "Merge Queue: Choose a merge method per pull request" +description: "Let whoever submits a PR pick squash, rebase, or merge commit for that PR, from the web app, a /trunk merge comment, or the API." +date: 2026-11-04 +category: Merge Queue +type: new-feature +--- + +**Merge one PR differently without changing your queue's default.** + +### New features + +- **Per-PR merge method.** Turn on **Allow choosing a merge method per pull request** in your queue's **Settings** → **General**. Anyone who can submit PRs can then pick squash, rebase, or merge commit. PRs that don't choose use the queue's default. See [Choosing a merge method per pull request](/merge-queue/administration/advanced-settings#choosing-a-merge-method-per-pull-request). +- **Choose it anywhere you submit.** Use the menu beside the submit button in the Trunk web app, add `--merge-method=rebase` (or `squash`, `merge`) to `/trunk merge`, or send `mergeMethod` through the [API](/merge-queue/using-the-queue/api#merge-method). +- **See what's chosen.** The submit button, a **Merge method** badge on the PR's page, and Trunk's PR comment all show the chosen method. + +### Updates + +- **Clear refusals.** Trunk refuses a method that is disabled, changes mid-merge, or is blocked by your branch rulesets, and tells you why. If GitHub refuses the method at merge time, Trunk removes the PR from the queue and comments with GitHub's reason. +- **Stacks.** Every PR merged together in a [stack](/merge-queue/using-the-queue/stacked-pull-requests) uses the method chosen on the PR you submitted. diff --git a/changelog/index.mdx b/changelog/index.mdx index efe9e023..dfbc59a9 100644 --- a/changelog/index.mdx +++ b/changelog/index.mdx @@ -14,6 +14,12 @@ rss: true Send your build tool's impact to Dynamic CI from Buildkite, show verdicts on GitHub Actions run summaries, and set up the action with a lighter checkout. + + **[Merge Queue: Choose a merge method per pull request](/changelog/2026-11-04-merge-queue-per-pr-merge-method)** + + Let whoever submits a PR pick squash, rebase, or merge commit for that PR, from the web app, a /trunk merge comment, or the API. + + **[Code Quality: CLI 1.29.0](/changelog/2026-11-03-code-quality-cli-1-29-0)** diff --git a/docs.json b/docs.json index 860488e3..47a88d2b 100644 --- a/docs.json +++ b/docs.json @@ -968,6 +968,7 @@ "group": "November", "pages": [ "changelog/2026-11-04-dynamic-ci-impacts-and-action-updates", + "changelog/2026-11-04-merge-queue-per-pr-merge-method", "changelog/2026-11-03-code-quality-cli-1-29-0" ] }, diff --git a/merge-queue/changelog.mdx b/merge-queue/changelog.mdx index 14a27eed..c0fcf6da 100644 --- a/merge-queue/changelog.mdx +++ b/merge-queue/changelog.mdx @@ -7,6 +7,14 @@ og:title: "Trunk Merge Queue changelog" ## 2026 +### November 2026 + + + **[Merge Queue: Choose a merge method per pull request](/changelog/2026-11-04-merge-queue-per-pr-merge-method)** + + Let whoever submits a PR pick squash, rebase, or merge commit for that PR, from the web app, a /trunk merge comment, or the API. + + ### October 2026