Skip to content

docs: document merge strategies and fast-forward merge method#10635

Open
jd wants to merge 1 commit intomainfrom
devs/jd/worktree-fast-forward/I7c4763490a004d1dc95755162238d03915a9b781
Open

docs: document merge strategies and fast-forward merge method#10635
jd wants to merge 1 commit intomainfrom
devs/jd/worktree-fast-forward/I7c4763490a004d1dc95755162238d03915a9b781

Conversation

@jd
Copy link
Member

@jd jd commented Mar 20, 2026

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

Copilot AI review requested due to automatic review settings March 20, 2026 15:53
@mergify mergify bot had a problem deploying to Mergify Merge Protections March 20, 2026 15:53 Failure
@mergify
Copy link
Contributor

mergify bot commented Mar 20, 2026

Merge Protections

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

🔴 👀 Review Requirements

This rule is failing.
  • any of:
    • #approved-reviews-by >= 2
    • author = dependabot[bot]
    • author = mergify-ci-bot

🔴 🔎 Reviews

This rule is failing.
  • #review-requested = 0
  • #review-threads-unresolved = 0
  • #changes-requested-reviews-by = 0

🟠 🤖 Continuous Integration

Waiting checks: test-broken-links.
  • all of:
    • any of:
      • check-success = test-broken-links
      • label = ignore-broken-links
    • check-success = build
    • check-success = lint
    • check-success = test
    • any of:
      • check-success=Cloudflare Pages
      • -head-repo-full-name~=^Mergifyio/

🟢 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)(?:\(.+\))?:

🟢 📕 PR description

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

@mergify mergify bot requested a review from a team March 20, 2026 15:55
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

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-forward in queue rules docs and link to the new guide.
  • Clarify on the batches page the difference between queue_branch_merge_method (batch branch) and merge_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.

@jd jd marked this pull request as ready for review March 20, 2026 16:26
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
@jd jd force-pushed the devs/jd/worktree-fast-forward/I7c4763490a004d1dc95755162238d03915a9b781 branch from 694bbec to cce8f04 Compare March 20, 2026 17:10
@mergify mergify bot had a problem deploying to Mergify Merge Protections March 20, 2026 17:10 Failure
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

Allow to rebase+merge with --no-ff

2 participants