merge queue: queuing main (cb0cafd) and #11822 together#11847
Closed
mergify[bot] wants to merge 3 commits into
Closed
merge queue: queuing main (cb0cafd) and #11822 together#11847mergify[bot] wants to merge 3 commits into
mergify[bot] wants to merge 3 commits into
Conversation
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (cb0cafd) and #11822 are queued together for merge.
This pull request has been created by Mergify to check the mergeability of #11822.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:depends-on = Mergifyio/docs#11820[⛓️ docs(stacks): sync stacks docs with current CLI #11820]schedule=Mon-Fri 09:00-17:30[Europe/Paris]title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-botbody ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/Required conditions to stay in the queue:
author != dependabot[bot]author != mergify-ci-botdepends-on = Mergifyio/docs#11820[⛓️ docs(stacks): sync stacks docs with current CLI #11820]title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-botbody ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/