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..9e683ef5 --- /dev/null +++ b/changelog/2026-11-04-merge-queue-per-pr-merge-method.mdx @@ -0,0 +1,21 @@ +--- +title: "Merge Queue: Choose a merge method per pull request" +description: "Let each pull request merge with squash, rebase, or a merge commit instead of the queue's default method." +date: 2026-11-04 +category: Merge Queue +type: new-feature +--- + +**Pull requests can now merge with a different method from the rest of the queue.** + +### New features + +- **Per-PR merge method.** Turn on **Allow choosing a merge method per pull request** under your queue's **Settings** → **General**. It's off by default. PRs that don't choose a method still use the queue's method. See [Choosing a merge method per pull request](/merge-queue/administration/advanced-settings#choosing-a-merge-method-per-pull-request). +- **Choose from the web app, a comment, or the API.** Pick a method from the menu beside the submit button, or comment `/trunk merge --merge-method=rebase`. Through the API, send `mergeMethod` when you submit or update a queued PR. See the [comment reference](/merge-queue/using-the-queue/reference) and [API guide](/merge-queue/using-the-queue/api#merge-method). + +### Updates + +- **See the chosen method.** The submit button, a **Merge method** badge on the PR's page, and Trunk's PR comment show which method the PR uses. +- **Default merge method.** The queue-wide dropdown is now named **Default merge method**. +- **Stacks.** When Trunk merges a [stack](/merge-queue/using-the-queue/stacked-pull-requests) together, every PR uses the method chosen on the PR you submitted. +- **Clear refusals.** Trunk refuses a method the queue or the branch's GitHub rulesets don't allow, 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. diff --git a/changelog/index.mdx b/changelog/index.mdx index efe9e023..77fd7a98 100644 --- a/changelog/index.mdx +++ b/changelog/index.mdx @@ -8,6 +8,12 @@ rss: true ### November 2026 + + **[Merge Queue: Choose a merge method per pull request](/changelog/2026-11-04-merge-queue-per-pr-merge-method)** + + Let each pull request merge with squash, rebase, or a merge commit instead of the queue's default method. + + **[Dynamic CI: Build tool impact signal and GitHub Action updates](/changelog/2026-11-04-dynamic-ci-impacts-and-action-updates)** diff --git a/docs.json b/docs.json index bd096033..e5169b60 100644 --- a/docs.json +++ b/docs.json @@ -967,6 +967,7 @@ { "group": "November", "pages": [ + "changelog/2026-11-04-merge-queue-per-pr-merge-method", "changelog/2026-11-04-dynamic-ci-impacts-and-action-updates", "changelog/2026-11-03-code-quality-cli-1-29-0" ] diff --git a/merge-queue/changelog.mdx b/merge-queue/changelog.mdx index 14a27eed..0c2e0ba5 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 each pull request merge with squash, rebase, or a merge commit instead of the queue's default method. + + ### October 2026