Skip to content

docs(stacks): sync stacks docs with current CLI#11820

Merged
mergify[bot] merged 1 commit into
mainfrom
devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f
Jun 16, 2026
Merged

docs(stacks): sync stacks docs with current CLI#11820
mergify[bot] merged 1 commit into
mainfrom
devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f

Conversation

@jd

@jd jd commented Jun 12, 2026

Copy link
Copy Markdown
Member

Replace the git rebase -i flows in the Updating Stacks guide with the
dedicated non-interactive subcommands the CLI now ships:
edit/reword/reorder/move/drop/fixup/squash, each with --dry-run.

Document the revision-history comment and mergify stack note, add a
revision-history section (and browser-extension screenshot) to the
reviewing guide, add the stack-revision-history git config option, and
use mergify stack sync after a merge instead of a bare re-push.

Refresh the stack-comment screenshot to the current table layout, fix
stale "interactive rebase" rows in the gh-stack and Graphite comparison
tables, and soften the landing-page claim that there are no new commands
to learn.

Co-Authored-By: Claude Opus 4.8 (1M context) noreply@anthropic.com

Copilot AI review requested due to automatic review settings June 12, 2026 13:58
@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 12, 2026 13:58 Failure
@mergify

mergify Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🟢 🤖 Continuous Integration

Wonderful, this rule succeeded.
  • all of:
    • check-success = build
    • check-success = lint
    • check-success = test
    • any of:
      • check-success = test-broken-links
      • label = ignore-broken-links
    • any of:
      • check-success=Cloudflare Pages
      • -head-repo-full-name~=^Mergifyio/

🟢 👀 Review Requirements

Wonderful, this rule succeeded.
  • any of:
    • #approved-reviews-by >= 2
    • author = dependabot[bot]
    • author = mergify-ci-bot

🟢 Enforce conventional commit

Wonderful, this rule succeeded.

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:

🟢 🔎 Reviews

Wonderful, this rule succeeded.
  • #changes-requested-reviews-by = 0
  • #review-requested = 0
  • #review-threads-unresolved = 0

🟢 📕 PR description

Wonderful, this rule succeeded.
  • body ~= (?ms:.{48,})

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Updates the Mergify Stacks documentation to match the current CLI workflow, replacing interactive rebase-driven instructions with dedicated mergify stack subcommands and adding reviewer-facing guidance for revision history.

Changes:

  • Reworked Updating Stacks to document non-interactive history rewrite commands (edit, reword, reorder, move, drop, fixup, squash), plus --dry-run, stack note, and stack sync.
  • Documented the new mergify-cli.stack-revision-history setting and added a Revision History section (with screenshot) to the reviewer guide.
  • Refreshed comparison tables (Graphite, gh-stack) and adjusted positioning on the Stacks landing page.

Reviewed changes

Copilot reviewed 6 out of 8 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
src/content/docs/stacks/updating.mdx Replaces interactive rebase walkthroughs with dedicated mergify stack rewrite/sync/note commands and revision-history behavior.
src/content/docs/stacks/setup.mdx Adds mergify-cli.stack-revision-history to the configuration table.
src/content/docs/stacks/reviewing.mdx Adds a Revision History section and screenshot, plus a browser-extension cross-reference.
src/content/docs/stacks/compare/graphite.mdx Updates comparison rows for edit/reorder/squash flows to match new CLI subcommands.
src/content/docs/stacks/compare/gh-stack.mdx Updates comparison rows for edit/squash and clarifies stack visualization via extension panel.
src/content/docs/stacks.mdx Softens the “no new commands” positioning on the Stacks landing page.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/content/docs/stacks/reviewing.mdx Outdated
Comment thread src/content/docs/stacks.mdx Outdated
Comment thread src/content/docs/stacks/compare/graphite.mdx Outdated
@jd jd force-pushed the devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f branch from 4655a2b to 95102a3 Compare June 12, 2026 14:06
@jd

jd commented Jun 12, 2026

Copy link
Copy Markdown
Member Author

This pull request is part of a Mergify stack:

# Pull Request Link
1 docs(stacks): sync stacks docs with current CLI #11820 👈
2 docs(stacks): add "vs Plain Git" comparison page #11822
3 docs: move Browser Extensions out of the Merge Queue section #11825
4 refactor(stacks): extract shared install snippets into partials #11826
5 docs: install the CLI via the install script #11839

@jd

jd commented Jun 12, 2026

Copy link
Copy Markdown
Member Author

Revision history

# Type Changes Reason Date
1 initial 4655a2b 2026-06-12 14:07 UTC
2 rebase 4655a2b → 95102a3 (rebase only) 2026-06-12 14:07 UTC
3 rebase 95102a3 → 4a7c17e (rebase only) 2026-06-12 15:53 UTC
4 content 4a7c17e → 671150e (raw) address review: drop rule-of-three phrasing in reviewing/landing; align gt absorb concept-map row with the 'not supported' feature row 2026-06-13 19:26 UTC

@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 12, 2026 14:07 Failure
@mergify mergify Bot requested a review from a team June 12, 2026 14:12
@jd jd marked this pull request as ready for review June 12, 2026 14:37
@jd jd force-pushed the devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f branch from 95102a3 to 4a7c17e Compare June 12, 2026 15:53
@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 12, 2026 15:53 Failure
Replace the git rebase -i flows in the Updating Stacks guide with the
dedicated non-interactive subcommands the CLI now ships:
edit/reword/reorder/move/drop/fixup/squash, each with --dry-run.

Document the revision-history comment and `mergify stack note`, add a
revision-history section (and browser-extension screenshot) to the
reviewing guide, add the stack-revision-history git config option, and
use `mergify stack sync` after a merge instead of a bare re-push.

Refresh the stack-comment screenshot to the current table layout, fix
stale "interactive rebase" rows in the gh-stack and Graphite comparison
tables, and soften the landing-page claim that there are no new commands
to learn.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Change-Id: I084ff85fe6c9214271eaa9d4bd0d9620777d540a
@jd jd force-pushed the devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f branch from 4a7c17e to 671150e Compare June 13, 2026 19:26
@mergify mergify Bot deployed to Mergify Merge Protections June 13, 2026 19:26 Active
@jd jd requested a review from a team June 15, 2026 13:16
@jd jd closed this Jun 15, 2026
@jd jd reopened this Jun 15, 2026
@mergify

mergify Bot commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Queued — the merge queue status continues in this comment ↓.

@mergify

mergify Bot commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

This pull request spent 14 hours 15 minutes 24 seconds in the queue, including 2 minutes 5 seconds running CI.

Required conditions to merge

@mergify mergify Bot added the queued label Jun 15, 2026
mergify Bot added a commit that referenced this pull request Jun 16, 2026
@mergify mergify Bot merged commit cb0cafd into main Jun 16, 2026
13 of 18 checks passed
@mergify mergify Bot deleted the devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f branch June 16, 2026 07:03
@mergify mergify Bot removed the queued label Jun 16, 2026
mergify Bot pushed a commit that referenced this pull request Jun 16, 2026
Add an honest comparison between Mergify Stacks and stacking by hand
with `git rebase` + `gh pr create`, the baseline every other stacking
tool is measured against.

Covers the manual recipe and its upkeep cost, a feature-by-feature
table, a candid "when plain Git is enough" section, where Stacks pulls
ahead (self-maintaining chain, Change-Id identity across rewrites,
reviewer context, Merge Queue integration), an incremental "coming from
a custom script" path, and an explicit off-ramp note. Wire it into the
compare index grid.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Depends-On: #11820
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.

4 participants