Skip to content

Remove stacked PR references#657

Merged
trunk-staging-io[bot] merged 3 commits into
mainfrom
phil/remove-stacked-prs
May 13, 2026
Merged

Remove stacked PR references#657
trunk-staging-io[bot] merged 3 commits into
mainfrom
phil/remove-stacked-prs

Conversation

@pv72895
Copy link
Copy Markdown
Contributor

@pv72895 pv72895 commented May 13, 2026

we're rolling back the feature for now

@trunk-staging-io
Copy link
Copy Markdown

trunk-staging-io Bot commented May 13, 2026

😎 Merged successfully - details.

@claude
Copy link
Copy Markdown
Contributor

claude Bot commented May 13, 2026

Claude finished @pv72895's task in 1m 51s —— View job


Claude PR Review

  • Read the PR diff
  • Examine each changed file in context
  • Check for typos, grammar, formatting issues
  • Check for documentation best practices
  • Post review feedback

Summary

The PR cleanly excises /trunk stack / stacked PR mentions from the six files that previously referenced them: the SUMMARY table of contents, the Using the Queue index, reference.md, chrome-extension.md, the branch-protection setup checklist, the metrics table (four cancellation reasons), and trunk-sudo-app.md. No broken cross-references introduced — I greped the tree and the remaining "stack" matches are all unrelated (stack traces, observability stacks, the code-quality CLI's separate "Stacked PR support" config flag). Prose changes read cleanly.

Issues

1. Orphaned page (see inline on summary.md) — the source file merge-queue/using-the-queue/stacked-pull-requests.md (~12 KB, full feature writeup) is no longer linked from anywhere but still lives in the repo. After this PR it's still buildable via direct URL and still presents /trunk stack as a supported feature, contradicting the rest of the site. Either git rm it or replace its contents with a short deprecation notice. This is the only thing I'd consider blocking-ish.

2. Wording nit (see inline on trunk-sudo-app.md line 12) — "bypass-dependent features" reads oddly now that Force merge is the only one. Polish, not blocking.

Other notes

  • merge-queue/administration/metrics.md: the four "(stacked PRs only)" rows removed from the cancel-reason table are gone cleanly; surrounding column widths and table structure are untouched.
  • merge-queue/chrome-extension.md: the section removal leaves a clean transition from "Track testing progress" → "Rolling the Extension out to an entire Org". Good.
  • merge-queue/getting-started/configure-branch-protection.md: both touch points (step 5 and the preflight checklist) stay parallel — nice consistency.
    · Branch: phil/remove-stacked-prs

Comment thread summary.md
* [Submit and cancel pull requests](merge-queue/using-the-queue/reference.md)
* [Monitor queue status](merge-queue/using-the-queue/monitor-queue-status.md)
* [Handle failed pull requests](merge-queue/using-the-queue/handle-failed-pull-requests.md)
* [Work with stacked pull requests](merge-queue/using-the-queue/stacked-pull-requests.md)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the page still remains but we don't link to it

Comment thread summary.md
@@ -29,7 +29,6 @@
* [Submit and cancel pull requests](merge-queue/using-the-queue/reference.md)
* [Monitor queue status](merge-queue/using-the-queue/monitor-queue-status.md)
* [Handle failed pull requests](merge-queue/using-the-queue/handle-failed-pull-requests.md)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Orphaned page — merge-queue/using-the-queue/stacked-pull-requests.md still exists

After this PR, no markdown file links to stacked-pull-requests.md (the entry is removed from summary.md, using-the-queue/README.md, reference.md, chrome-extension.md, trunk-sudo-app.md, and configure-branch-protection.md), but the 12 KB source file is still in the repo and still describes /trunk stack as a supported feature.

If the goal of this PR is to retire the feature from the docs, the page should either be deleted or replaced with a short deprecation/redirect notice. Leaving an orphan markdown file means:

  • The page is still buildable/indexable by GitBook and search engines via direct URL.
  • It still cross-links to other pages (Trunk Sudo, priority merging, batching, predictive testing), making it look like a live, supported workflow.
  • Old bookmarks and Slack links land on documentation that contradicts the rest of the site.

If keeping the URL alive intentionally (e.g. for SEO/inbound links), consider trimming the file down to a short "this feature has been removed" notice instead. Otherwise git rm it.

Fix this →

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intentional

Comment thread setup-and-administration/trunk-sudo-app.md Outdated
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
@claude
Copy link
Copy Markdown
Contributor

claude Bot commented May 13, 2026

Claude finished @pv72895's task in 1m 10s —— View job


Claude PR Review

  • Read the PR diff
  • Examine each changed file in context
  • Check for typos, grammar, formatting issues
  • Check for documentation best practices
  • Post review feedback

Summary

Re-reviewed after the latest synchronize. Both items I flagged earlier are now resolved:

  1. Wording nit on trunk-sudo-app.md — fixed in 5a39a2c. The line now reads "Trunk Sudo is a prerequisite for bypass-dependent features. Today the only such feature is Force merge." which keeps the door open for future bypass-dependent features without overstating the present.
  2. Orphan stacked-pull-requests.md — confirmed intentional by the author. No action needed.

Re-check of the diff

  • merge-queue/administration/metrics.md — the four (stacked PRs only) cancel-reason rows are gone; the surviving rows render the same.
  • merge-queue/chrome-extension.md — the "Stacked pull requests" section is removed cleanly; transition from Track testing progressRolling the Extension out to an entire Org reads fine.
  • merge-queue/getting-started/configure-branch-protection.md — step 5 and the preflight checklist remain parallel after the trim.
  • merge-queue/using-the-queue/README.md and summary.md — link removed from both indexes consistently.
  • merge-queue/using-the-queue/reference.md — the /trunk stack sentence is gone; the surrounding paragraph still flows.
  • setup-and-administration/trunk-sudo-app.md — "Features that use Trunk Sudo" section removed; the lead paragraph now carries the same information more concisely.

Spot-checked for stragglers with grep -rn 'trunk stack\|stacked pr\|stacked pull' — only hits left are the unrelated code-quality/.../README.md "Stacked PR support" section, which describes a separate use_branch_upstream flag in the Code Quality CLI and is correctly out of scope for this PR.

No blocking issues. LGTM.

· Branch: phil/remove-stacked-prs ·

Copy link
Copy Markdown

@github-actions github-actions Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved: Claude code review passed.

@trunk-staging-io trunk-staging-io Bot merged commit ef96fb2 into main May 13, 2026
7 checks passed
@trunk-staging-io trunk-staging-io Bot deleted the phil/remove-stacked-prs branch May 13, 2026 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant