Repository navigation
CI: flag PRs that conflict with main - #2238
Conversation
Re-checks every open PR on each push to main (and a PR's own pushes), adds a merge-conflict label plus one comment so the session watching the PR wakes and merges main in, drops ready-to-merge, and removes the label once clean. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0186neA427NKUHL8tCv9hvog
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
Reviewed commit f19772a. 1 inline finding(s) posted. |
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0186neA427NKUHL8tCv9hvog
PR Surface ReportCompared Summary: 1 changed file(s) | EF migrations: 0 added file(s), max 0/1 per context Reforge Surface Score
Section DeltasNo section score changes. Section Size & Complexity DeltasNo section size/complexity changes. Rule DeltasNo rule score changes. Published Write Surface17 of 51 sections publish write capability, 51 interfaces (0). Interface SurfaceNo new interfaces or interface members. Diff Size
New Files
|
|
@codex review |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: fad9e3446b
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Drop ready-to-merge on every conflicted run, comment before labelling so a failed comment is retried, and treat a 404 label removal as done. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0186neA427NKUHL8tCv9hvog
Requested by Peter · project thread
What
New workflow
merge-conflict-label.yml. On every push tomainit checks all open PRs (and on a PR's own pushes, just that PR). A conflicted PR gets amerge-conflictlabel, losesready-to-merge, and gets one comment asking to mergemainin. The label comes off once the PR merges cleanly. No re-comment while the label stays on.Why
GitHub sends no event when a PR becomes conflicted, so watching sessions never notice. The comment wakes the session subscribed to the PR. No AI, no tokens.
Existing surface checked
Modelled on
label-db.yml(samegithub-scriptpattern). No app code touched.Checklist
tier:lightweight(CI-only, one new workflow).Migrations, NOT NULL, NuGet, nav, NodaTime, localization: n/a, no app code.mainonpeterdrier/Humans, branched offorigin/main.Verify after merge: Actions → "Flag PRs with merge conflicts" → Run workflow labels any currently conflicted PR.
Generated by Claude Code