Skip to content

docs: add deprecation notices for rebase on fork PRs with bot_account#10817

Merged
mergify[bot] merged 1 commit intomainfrom
devs/kozlek/docs/deprecate-rebase-fork-bot-account/I6e2d84df762c895f12980f38ad1cfbe09fb4da41
Apr 3, 2026
Merged

docs: add deprecation notices for rebase on fork PRs with bot_account#10817
mergify[bot] merged 1 commit intomainfrom
devs/kozlek/docs/deprecate-rebase-fork-bot-account/I6e2d84df762c895f12980f38ad1cfbe09fb4da41

Conversation

@kozlek
Copy link
Copy Markdown
Contributor

@kozlek kozlek commented Apr 2, 2026

The git-based rebase code path for fork PRs with bot account
impersonation will be removed on July 1, 2026. Add caution/note
callouts to affected documentation pages:

  • rebase action: recommend switching to the update action
  • rebase command: recommend switching to the update command
  • merge queue parallel checks: warn about update_bot_account + rebase
  • merge strategies: warn about update_method=rebase on fork PRs

Relates to Mergifyio/engine#27909 and Mergifyio/engine#27959.

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

Copilot AI review requested due to automatic review settings April 2, 2026 15:23
@mergify mergify bot had a problem deploying to Mergify Merge Protections April 2, 2026 15:23 Failure
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 2, 2026

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

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

jd
jd previously approved these changes Apr 2, 2026
@mergify mergify bot requested a review from a team April 2, 2026 15:25
Copy link
Copy Markdown

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 deprecation notices across the documentation for the upcoming removal (July 1, 2026) of the git-based rebase path for fork PRs when using bot impersonation, and points users to supported alternatives (update action/command, or merge-based updates in merge queue contexts).

Changes:

  • Add caution callouts to rebase workflow docs recommending update for fork PRs.
  • Add cautions/notes to merge queue docs warning about update_bot_account + rebase behavior for fork PRs and recommending update_method: merge.
  • Add a caution to the rebase command docs recommending the update command for fork PRs.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
src/content/docs/workflow/rebase.mdx Adds a deprecation caution and links to update alternatives for fork PRs.
src/content/docs/workflow/actions/rebase.mdx Adds a caution about bot_account + rebase action no longer supporting fork PRs after the deprecation date.
src/content/docs/merge-queue/parallel-checks.mdx Adds a caution about update_bot_account with rebase-style updates for fork PRs and suggests switching to update_method: merge.
src/content/docs/merge-queue/merge-strategies.mdx Adds a caution/note about fork PR support ending for rebase updates with update_bot_account, with cross-reference to migration guidance.
src/content/docs/commands/rebase.mdx Adds a deprecation caution and recommends the update command for fork PRs.

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

@kozlek kozlek force-pushed the devs/kozlek/docs/deprecate-rebase-fork-bot-account/I6e2d84df762c895f12980f38ad1cfbe09fb4da41 branch from 2eb69d1 to ceb480b Compare April 2, 2026 15:52
@mergify mergify bot dismissed jd’s stale review April 2, 2026 15:52

Pull request has been modified.

@mergify mergify bot had a problem deploying to Mergify Merge Protections April 2, 2026 15:52 Failure
The git-based rebase code path for fork PRs with bot account
impersonation will be removed on July 1, 2026. Add caution/note
callouts to affected documentation pages:

- rebase action: recommend switching to the update action
- rebase command: recommend switching to the update command
- merge queue parallel checks: warn about update_bot_account + rebase
- merge strategies: warn about update_method=rebase on fork PRs

Relates to Mergifyio/engine#27909 and Mergifyio/engine#27959.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Change-Id: I6e2d84df762c895f12980f38ad1cfbe09fb4da41
Claude-Session-Id: e4bb0e02-cc73-49e4-b143-e666f0a6f5f8
@kozlek kozlek force-pushed the devs/kozlek/docs/deprecate-rebase-fork-bot-account/I6e2d84df762c895f12980f38ad1cfbe09fb4da41 branch from ceb480b to ee0873d Compare April 2, 2026 17:08
@kozlek kozlek marked this pull request as ready for review April 2, 2026 17:08
@mergify mergify bot deployed to Mergify Merge Protections April 2, 2026 17:08 Active
@mergify mergify bot requested a review from a team April 2, 2026 18:13
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 3, 2026

Merge Queue Status

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

Required conditions to merge

mergify bot added a commit that referenced this pull request Apr 3, 2026
mergify bot added a commit that referenced this pull request Apr 3, 2026
mergify bot added a commit that referenced this pull request Apr 3, 2026
mergify bot added a commit that referenced this pull request Apr 3, 2026
@mergify mergify bot added the queued label Apr 3, 2026
mergify bot added a commit that referenced this pull request Apr 3, 2026
@mergify mergify bot merged commit 977a554 into main Apr 3, 2026
9 of 14 checks passed
@mergify mergify bot deleted the devs/kozlek/docs/deprecate-rebase-fork-bot-account/I6e2d84df762c895f12980f38ad1cfbe09fb4da41 branch April 3, 2026 07:03
@mergify mergify bot removed the queued label Apr 3, 2026
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.

5 participants