Skip to content

fix: keep PR conflict status current after relay updates - #1313

Merged
wesm merged 1 commit into
mainfrom
sync-not-updating-merge-conflicts
Oct 8, 2026
Merged

wesm merged 1 commit into
mainfrom
sync-not-updating-merge-conflicts

Conversation

@wesm

@wesm wesm commented Oct 7, 2026

Copy link
Copy Markdown
Member

PR conflict warnings could stay stale after a base-branch update, leaving the conflict undiscovered until a merge attempt.

  • Keep relay updates from suppressing the full refresh that checks mergeability.
  • Recheck unresolved GitHub mergeability on the next budgeted sync, even when the PR timestamp has not changed.

@roborev-ci

roborev-ci Bot commented Oct 7, 2026

Copy link
Copy Markdown

roborev: Combined Review (fa5a27a)

Verdict: No findings at or above medium severity.


Reviewers: 2x codex, codex (security) | Synthesis: codex | Total: 2m16s

A relay branch hint could consume the list change that scheduled sync
uses to refresh mergeability. PR details could also remain recently
fetched while GitHub had not yet resolved their mergeability, delaying
a conflict warning until a later refresh or merge attempt.

Keep those unresolved PRs eligible within the existing provider budget
and preserve normal sync's opportunity to observe the complete state.

Generated with Codex
Co-authored-by: Codex <noreply@openai.com>
@wesm
wesm force-pushed the sync-not-updating-merge-conflicts branch from fa5a27a to 99d087c Compare October 7, 2026 17:39
@roborev-ci

roborev-ci Bot commented Oct 7, 2026

Copy link
Copy Markdown

roborev: Combined Review (99d087c)

Verdict: No findings at or above medium severity.


Reviewers: 2x codex, codex (security) | Synthesis: codex | Total: 2m0s

@wesm
wesm merged commit 44d00da into main Oct 8, 2026
30 of 31 checks passed
@wesm
wesm deleted the sync-not-updating-merge-conflicts branch October 8, 2026 01:24
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.

1 participant