Skip to content

docs(stacks): add "vs Plain Git" comparison page#11822

Merged
mergify[bot] merged 2 commits into
mainfrom
devs/jd/worktree-update-stacks/add-vs-plain-git-comparison-page--7f58b122
Jun 16, 2026
Merged

docs(stacks): add "vs Plain Git" comparison page#11822
mergify[bot] merged 2 commits into
mainfrom
devs/jd/worktree-update-stacks/add-vs-plain-git-comparison-page--7f58b122

Conversation

@jd

@jd jd commented Jun 12, 2026

Copy link
Copy Markdown
Member

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

@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

@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 12, 2026 14:07 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.

🟢 ⛓️ Depends-On Requirements

Wonderful, this rule succeeded.

Requirement based on the presence of Depends-On in the body of the pull request

🟢 🤖 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,})

@mergify mergify Bot requested a review from a team June 12, 2026 14:12
Comment thread src/content/docs/stacks/compare/plain-git.mdx
@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
@jd jd force-pushed the devs/jd/worktree-update-stacks/add-vs-plain-git-comparison-page--7f58b122 branch from 1696ea1 to ce4c04e Compare June 12, 2026 15:53
@jd

jd commented Jun 12, 2026

Copy link
Copy Markdown
Member Author

Revision history

# Type Changes Reason Date
1 initial 1696ea1 2026-06-12 15:53 UTC
2 content 1696ea1 → ce4c04e (raw) 2026-06-12 15:53 UTC
3 rebase ce4c04e → 9cb8af6 (rebase only) 2026-06-13 19:26 UTC

@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 12, 2026 15:53 Failure
jd and others added 2 commits June 13, 2026 21:21
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
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>
Change-Id: I7f58b1226bdb39616cc81de109aa9b5ebfbedcf3
@jd jd force-pushed the devs/jd/worktree-update-stacks/add-vs-plain-git-comparison-page--7f58b122 branch from ce4c04e to 9cb8af6 Compare June 13, 2026 19:26
@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 marked this pull request as ready for review June 15, 2026 13:16
Base automatically changed from devs/jd/worktree-update-stacks/sync-stacks-docs-current-cli--084ff85f to main June 16, 2026 07:03
@mergify mergify Bot requested a review from a team June 16, 2026 07:20
@mergify

mergify Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

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

@mergify

mergify Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

This pull request spent 3 minutes 33 seconds in the queue, including 2 minutes 3 seconds running CI.

Required conditions to merge

mergify Bot added a commit that referenced this pull request Jun 16, 2026
@mergify mergify Bot added the queued label Jun 16, 2026
@mergify mergify Bot merged commit e9cd483 into main Jun 16, 2026
8 of 13 checks passed
@mergify mergify Bot deleted the devs/jd/worktree-update-stacks/add-vs-plain-git-comparison-page--7f58b122 branch June 16, 2026 07:50
@mergify mergify Bot removed the queued label Jun 16, 2026
mergify Bot pushed a commit that referenced this pull request Jun 16, 2026
The browser extension now surfaces Stacks context (the stack chain and
revision-history timeline) in addition to merge queue controls, so
nesting it under Merge Queue no longer fits.

Relocate the page to /browser-extensions and group it with the CLI under
a new top-level Tools nav group, move its images alongside it, broaden
the content with a Stacks panel section, repoint the inbound links from
the stacks docs, and add a 301 redirect from the old URL.

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

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