Skip to content

Commit 977a554

Browse files
kozlekclaude
andauthored
docs: add deprecation notices for rebase on fork PRs with bot_account (#10817)
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/monorepo#27909 and Mergifyio/monorepo#27959. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a06c189 commit 977a554

3 files changed

Lines changed: 26 additions & 0 deletions

File tree

src/content/docs/commands/rebase.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ import RebaseAdvantage from './_rebase_advantages.mdx';
1919

2020
<RebaseAdvantage />
2121

22+
:::caution
23+
Rebasing fork pull requests using `bot_account` impersonation is
24+
deprecated and will stop working on **July 1, 2026**. Use the
25+
[`update` command](/commands/update) instead for fork PRs.
26+
:::
27+
2228
## Syntax
2329

2430
To make use of the `rebase` command, simply comment on the desired pull

src/content/docs/merge-queue/merge-strategies.mdx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ In this mode, `update_method` must be set to `rebase` (the default). If a
178178
rebase update occurs, the commit SHAs on the PR will change — what fast-forward
179179
preserves are the SHAs of the PR branch at merge time.
180180

181+
:::caution
182+
When using `update_bot_account` with fast-forward inplace mode, fork pull
183+
requests will no longer be supported after **July 1, 2026**. See the
184+
[update method deprecation note](#combining-merge-and-update-methods) for
185+
details and migration options.
186+
:::
187+
181188
```dot class="graph"
182189
strict digraph {
183190
fontname="sans-serif";
@@ -276,6 +283,12 @@ The `update_method` option controls how Mergify updates PR branches when they
276283
fall behind the base branch. Combining `merge_method` with `update_method`
277284
gives you additional control over your history shape.
278285

286+
:::note
287+
`update_method: rebase` combined with `update_bot_account` will no longer
288+
support fork pull requests after **July 1, 2026**. If your repository
289+
receives fork PRs, use `update_method: merge` instead.
290+
:::
291+
279292
### Semi-Linear History (Rebase + Merge Commit)
280293

281294
```yaml

src/content/docs/workflow/actions/rebase.mdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ up-to-date with the latest changes from the base branch.
1717
before being merged.
1818
:::
1919

20+
:::caution
21+
The `rebase` action with `bot_account` will no longer support fork pull
22+
requests after **July 1, 2026**. If you use this configuration on
23+
repositories that receive PRs from forks, switch to the
24+
[`update` action](/workflow/actions/update) instead.
25+
:::
26+
2027
## Parameters
2128

2229
<ActionOptionsTable def='RebaseActionModel'/>

0 commit comments

Comments
 (0)