Skip to content

fix: update /rebase command copy and outdated PR check hint#32174

Merged
mvvmm merged 3 commits into
productionfrom
fix/flue-rebase-copy
Jul 20, 2026
Merged

fix: update /rebase command copy and outdated PR check hint#32174
mvvmm merged 3 commits into
productionfrom
fix/flue-rebase-copy

Conversation

@mvvmm

@mvvmm mvvmm commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Summary

Follow-up to #32121. Two copy fixes:

  • Bot commands table: collapsed /rebase and /rebaseWithConflicts rows into a single /rebase row that describes the unified behavior (tries AI resolution on conflict)
  • Outdated PR check: appended "Codeowners can comment /rebase on the PR to fix." to the failure descriptions in both outdated-pr-check.yml and outdated-pr-refresh.yml

Documentation checklist

@cloudflare-docs-bot

cloudflare-docs-bot Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Review

💡 1 suggestion found in commit a32acc7.

Fix in your agent
Fix the following review findings in PR #32174 (https://github.com/cloudflare/cloudflare-docs/pull/32174).

Before making changes, review each finding and present a brief summary table:
- For each finding, state whether you agree, disagree, or need clarification
- If you disagree (e.g. the fix requires disproportionate effort for minimal benefit,
  or the finding is factually incorrect), explain why
- If you need clarification before deciding, ask those questions
- Then share your plan for which issues to tackle and in what order

After triaging, fix all legitimate findings. For any you decide to skip,
post a comment on this PR with the finding ID and your reasoning.

---

## Code Review

### Suggestions (1)

#### CR-f1d16bfae59b · Unreachable status branch updated
- **File:** `.flue/lib/code-review-render.ts` line 652
- **Issue:** The `halted-conflict` status message was changed, but the rebase workflow never emits `halted-conflict`; it only uses `halted-confidence`, `halted-wrong-base`, `halted-fork`, `complete`, `failed`, and `in-progress`. Updating this string changes dead code.
- **Fix:** Remove the `halted-conflict` case from `rebaseStatusLine` and drop `"halted-conflict"` from the `RebaseStatus` union if it will no longer be produced.

Code Review

This code review is in beta and may not always be helpful — use your judgment.

Suggestions (1)
File Issue
.flue/lib/code-review-render.ts line 652 Unreachable status branch updated — The halted-conflict status message was changed, but the rebase workflow never emits halted-conflict; it only uses halted-confidence, halted-wrong-base, halted-fork, complete, failed, and in-progress. Updating this string changes dead code. Fix: Remove the halted-conflict case from rebaseStatusLine and drop "halted-conflict" from the RebaseStatus union if it will no longer be produced.

Conventions

No convention issues found.

Style Guide Review

No style-guide issues found.

Commands

Only codeowners can run commands. Post a comment with the command to trigger it.

Command Description
/review Runs a review now. Incremental if a prior review exists, full if not.
/full-review Re-reviews the entire PR diff from scratch, ignoring incremental history. Useful after a rebase, when you want a fresh review, or if the bot gets out of sync and reports issues that no longer exist.
/ignore-review-limit Permanently lifts the 2-review automatic limit for this PR. Future pushes will trigger reviews as normal.
/disable-auto-review Stops automatic reviews from triggering on future pushes to this PR. Codeowners can still run /review or /full-review manually.
/rebase Rebases the PR branch against production. Stops if there are conflicts and reports which files conflict.
/rebaseWithConflicts Rebases against production and attempts to resolve conflicts automatically using AI. Stops with an explanation if confidence is not high enough.

@github-actions

Copy link
Copy Markdown
Contributor

This pull request requires reviews from CODEOWNERS as it changes files that match the following patterns:

Pattern Owners
*.ts @cloudflare/content-engineering, @kodster28
* @cloudflare/product-owners
/.github/ @cloudflare/content-engineering, @kodster28, @mvvmm, @colbywhite, @ahaywood, @MohamedH1998

@github-actions

github-actions Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@mvvmm

mvvmm commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

CR-f1d16bfae59b — already fixed. halted-conflict was removed from both the RebaseStatus union and the rebaseStatusLine switch in the most recent commit (a32acc7).

@github-actions

Copy link
Copy Markdown
Contributor

@mvvmm
mvvmm merged commit 37f62af into production Jul 20, 2026
16 checks passed
@mvvmm
mvvmm deleted the fix/flue-rebase-copy branch July 20, 2026 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants