Skip to content

docs(merge-queue): remove /trunk stack from stacked-pull-requests page#22

Merged
samgutentag merged 1 commit into
mainfrom
mintlify/migrate-trunk-docs-updates
May 19, 2026
Merged

docs(merge-queue): remove /trunk stack from stacked-pull-requests page#22
samgutentag merged 1 commit into
mainfrom
mintlify/migrate-trunk-docs-updates

Conversation

@mintlify
Copy link
Copy Markdown
Contributor

@mintlify mintlify Bot commented May 16, 2026

Summary

Removes the /trunk stack (combined-PR stacking via Trunk Sudo) documentation from merge-queue/using-the-queue/stacked-pull-requests.mdx. The page is rewritten to cover only the /trunk merge sequential-enqueue flow, which is unaffected and remains the supported way to merge a stack.

Why

Upstream rollback per trunk-io/docs#657 ("we're rolling back the feature for now"). Confirmed with Robert (merge-queue eng) that only the /trunk stack portion needs to be removed; the per-PR /trunk merge flow on the same page is unaffected.

Changes

  • merge-queue/using-the-queue/stacked-pull-requests.mdx — rewritten to cover only the per-PR enqueue flow:
    • Frontmatter description updated (drops /trunk stack reference).
    • Intro paragraph rewritten as a single-approach explanation.
    • "Choose your approach" comparison table removed.
    • Entire "Merge the stack as one unit" section removed (Prerequisites, Stack requirements, Command syntax, What happens when you run /trunk stack, The stacked PR, Lifecycle, Why /trunk stack creates a separate PR).
    • "Enqueue each PR individually" content promoted to the page's main flow (Step 1 / Step 2 / Considerations).

Net: 5 insertions, 132 deletions; one file changed.

Test plan

  • Preview the page on Mintlify and confirm only the /trunk merge flow renders.
  • Confirm no broken anchor links to #merge-the-stack-as-one-unit from elsewhere in the docs.

@samgutentag samgutentag changed the title docs: migrate recent updates from trunk-io/docs [ready to merge] docs: migrate recent updates from trunk-io/docs May 19, 2026
@samgutentag
Copy link
Copy Markdown
Member

Verification status (2026-05-19): live

Verified: customers can use this. Ready to publish.

Note: PRs #13 and #23 cover overlapping migration scope. This PR is the most complete (includes the stacked-PR rollback). Consider merging this and closing the other two.

@samgutentag samgutentag changed the title [ready to merge] docs: migrate recent updates from trunk-io/docs [needs rebase] docs(merge-queue): remove stacked-pull-requests page May 19, 2026
@samgutentag
Copy link
Copy Markdown
Member

Catchup check (2026-05-19): partially superseded, one change still needed.

Compared this PR's tree against current main:

A clean rebase against current main yields exactly that one deletion:

 merge-queue/using-the-queue/stacked-pull-requests.mdx | 178 ----------------------
 1 file changed, 178 deletions(-)

Options:

  1. Rebase this branch onto main (force-push) so the PR reduces to the clean single-file deletion. I tested the rebase locally; it applies cleanly with no conflicts.
  2. Close this PR and open a fresh one with just the deletion. Cleaner history but more churn.
  3. Cherry-pick the deletion onto a new branch.

Let me know which approach you prefer and I will proceed. Per the no-force-push rule, I have not modified the remote branch.

@samgutentag samgutentag force-pushed the mintlify/migrate-trunk-docs-updates branch from f833364 to d80574d Compare May 19, 2026 18:32
@samgutentag samgutentag changed the title [needs rebase] docs(merge-queue): remove stacked-pull-requests page [ready to merge] docs(merge-queue): remove stacked-pull-requests page May 19, 2026
@samgutentag
Copy link
Copy Markdown
Member

Rebased (2026-05-19). Branch force-pushed onto current main. PR now contains a single commit deleting merge-queue/using-the-queue/stacked-pull-requests.mdx (178 lines). Title and body updated to match. Ready to merge.

The /trunk stack command (combined-PR stacking via Trunk Sudo) was rolled
back upstream (trunk-io/docs#657). Per merge-queue eng feedback, only
that portion needs removal. The /trunk merge sequential-enqueue flow on
the same page is unaffected and remains valid.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@samgutentag samgutentag force-pushed the mintlify/migrate-trunk-docs-updates branch from d80574d to 3b9a479 Compare May 19, 2026 18:55
@samgutentag samgutentag changed the title [ready to merge] docs(merge-queue): remove stacked-pull-requests page [ready to merge] docs(merge-queue): remove /trunk stack from stacked-pull-requests page May 19, 2026
@samgutentag
Copy link
Copy Markdown
Member

Reworked (2026-05-19) per Robert's feedback in Slack.

Previous version deleted the whole stacked-pull-requests.mdx file. Robert confirmed only the /trunk stack portion needs removal; the per-PR /trunk merge flow documented on the same page is unaffected.

Branch force-pushed. The PR now contains a single commit that rewrites the page to cover only the sequential-enqueue flow (5 insertions / 132 deletions). Title and body updated to match.

@samgutentag samgutentag merged commit 0453740 into main May 19, 2026
3 checks passed
@samgutentag samgutentag added the ready to merge Verify docs PR: customers can use this. Ready to publish. label May 19, 2026
@samgutentag samgutentag changed the title [ready to merge] docs(merge-queue): remove /trunk stack from stacked-pull-requests page docs(merge-queue): remove /trunk stack from stacked-pull-requests page May 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge Verify docs PR: customers can use this. Ready to publish.

Development

Successfully merging this pull request may close these issues.

2 participants