Current
There is no UI signal for PRs in mergeable: CONFLICTING state. A PR that needs rebase looks identical to a PR that is ready to merge until the user opens GitHub.
Proposed
Add a "needs rebase" badge state to the priority-ordered PR badge list on cards. Drive it from the GraphQL mergeable field. Place it alongside the existing CI/thread indicators.
Rationale
Merge-conflict is a common blocker that currently has to be discovered manually. Surfacing it at card-glance level lets the user triage without clicking through.
Ref: specs/review/pr-tracking.feature
Current
There is no UI signal for PRs in
mergeable: CONFLICTINGstate. A PR that needs rebase looks identical to a PR that is ready to merge until the user opens GitHub.Proposed
Add a "needs rebase" badge state to the priority-ordered PR badge list on cards. Drive it from the GraphQL
mergeablefield. Place it alongside the existing CI/thread indicators.Rationale
Merge-conflict is a common blocker that currently has to be discovered manually. Surfacing it at card-glance level lets the user triage without clicking through.
Ref:
specs/review/pr-tracking.feature