docs: document merge strategies and fast-forward merge method#10635
Open
docs: document merge strategies and fast-forward merge method#10635
Conversation
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 👀 Review RequirementsThis rule is failing.
🔴 🔎 ReviewsThis rule is failing.
🟠 🤖 Continuous IntegrationWaiting checks:
|
There was a problem hiding this comment.
Pull request overview
Adds a new documentation guide for merge strategies in the Merge Queue section and updates existing Merge Queue docs to reference/clarify the new merge_method: fast-forward behavior and the distinction between PR merge method vs batch-branch merge method.
Changes:
- Add a new “Merge Strategies” guide page with diagrams and comparison/decision tables.
- Document
merge_method: fast-forwardin queue rules docs and link to the new guide. - Clarify on the batches page the difference between
queue_branch_merge_method(batch branch) andmerge_method(individual PRs).
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| src/content/navItems.tsx | Adds “Merge Strategies” to the Merge Queue navigation. |
| src/content/docs/merge-queue/rules.mdx | Documents merge_method including fast-forward and links to the new guide. |
| src/content/docs/merge-queue/merge-strategies.mdx | New guide page explaining merge methods, tradeoffs, diagrams, and fast-forward requirements. |
| src/content/docs/merge-queue/batches.mdx | Clarifies queue_branch_merge_method vs merge_method and refines the fast-forward note. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Add a new Merge Strategies guide page covering all four merge methods (merge, squash, rebase, fast-forward) with git history diagrams, a comparison table, and a decision matrix. Update queue rules reference to document `merge_method: fast-forward` and its requirements (batch_size: 1, max_parallel_checks: 1, branch protection bypass). Clarify the batches page to distinguish `queue_branch_merge_method` (batch branch merging) from `merge_method` (individual PR merging). Closes Mergifyio/mergify#67 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Change-Id: I7c4763490a004d1dc95755162238d03915a9b781 Claude-Session-Id: f877eb17-51e5-4239-b143-80c699c0557c
694bbec to
cce8f04
Compare
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
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.
Add a new Merge Strategies guide page covering all four merge methods
(merge, squash, rebase, fast-forward) with git history diagrams, a
comparison table, and a decision matrix.
Update queue rules reference to document
merge_method: fast-forwardand its requirements (batch_size: 1, max_parallel_checks: 1, branch
protection bypass).
Clarify the batches page to distinguish
queue_branch_merge_method(batch branch merging) from
merge_method(individual PR merging).Closes Mergifyio/mergify#67
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com