Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions changelog/2026-11-04-merge-queue-per-pr-merge-method.mdx
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 6 additions & 0 deletions changelog/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
</Update>

<Update label="November 4, 2026" tags={["Merge Queue"]}>
**[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.
</Update>

<Update label="November 3, 2026" tags={["Code Quality"]}>
**[Code Quality: CLI 1.29.0](/changelog/2026-11-03-code-quality-cli-1-29-0)**

Expand Down
1 change: 1 addition & 0 deletions docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand Down
8 changes: 8 additions & 0 deletions merge-queue/changelog.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ og:title: "Trunk Merge Queue changelog"

## 2026

### November 2026

<Update label="November 4, 2026" tags={["Merge Queue"]}>
**[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.
</Update>

### October 2026

<Update label="October 6, 2026" tags={["Merge Queue"]}>
Expand Down
Loading