Skip to content

fix(ci): report a conflicting PR instead of failing the recheck on main - #696

Merged
devantler merged 2 commits into
mainfrom
claude/recheck-conflict-skip
Nov 12, 2026
Merged

devantler merged 2 commits into
mainfrom
claude/recheck-conflict-skip

Conversation

@devantler

Copy link
Copy Markdown
Contributor

🤖 Generated by the Agentic Engineer

Fixes #695.

What changed

  • scripts/recheck-open-prs.sh: when the head-checked update-branch call fails, the script reads the PR once. If GitHub reports mergeable: false and mergeable_state: dirty for the same head the update tried, the PR is listed as skipped and the run adds a ::notice::. It no longer counts as a failure. Any other result (unknown or computing verdict, moved head, failed read) is still a failure, as before.
  • scripts/recheck-open-prs-base-refresh.test.sh: four new hermetic cases. A settled conflict exits 0 with no close, reopen, merge or CI wait. A computing verdict, a moved head and a failed read each still exit 1 with the original error.
  • docs/validation.md: documents the skip and the conditions for it.

Why this is safe

A conflicting PR cannot merge, so its stale pre-gate green cannot reach main. The push that resolves the conflict is a new head, and its own pull_request event runs every current gate.

Validation

  • bash scripts/recheck-open-prs-base-refresh.test.sh: all cases pass, including the four new ones.
  • bash scripts/recheck-open-prs.test.sh: passes.
  • shellcheck on both changed scripts: clean.
  • ./scripts/validate-manifests.sh: passes.
  • scripts/recheck-open-prs-observations.test.sh shows 2 failures locally on macOS. The same 2 failures occur with main's unmodified script, so they come from the local environment, not this change. CI runs it on Linux.
  • No plugin content changed, so there is no plugin version bump.

A branch that conflicts with the base cannot be updated or merged, and
the push that resolves the conflict runs every current gate. Count only
GitHub's settled conflict verdict for the head the update tried as a
skip; an unknown verdict, moved head or failed read stays a failure.

Fixes #695

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@devantler

Copy link
Copy Markdown
Contributor Author

🤖 Generated by the Agentic Engineer

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 12, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-12T09:47:30.717901Z 8a4b5e7 Manual request
ℹ️ 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" or "@codex security review".

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

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. What shall we delve into next?

Reviewed commit: 54fd24b9db

ℹ️ 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".

@devantler

Copy link
Copy Markdown
Contributor Author

🤖 Generated by the Agentic Engineer

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Nice work!

Reviewed commit: 8a4b5e70dd

ℹ️ 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".

@devantler

Copy link
Copy Markdown
Contributor Author

🤖 Generated by the Agentic Engineer

Ready at head 8a4b5e70dd0cb49cf0d2d7c535fa252aa3b0ce7a:

  • Tested: CI - Required Checks passed at this head (20 checks succeeded, 4 skipped). Locally, the base-refresh self-test passed, including the four new conflict cases, and so did recheck-open-prs.test.sh, shellcheck and validate-manifests.sh.
  • Reviewed: Codex found no issues at this head, and there are 0 review threads.
  • Tried: the hermetic test runs the production script against real local Git ancestry. A settled conflict is now skipped with a notice, and the computing, moved-head and failed-read cases still fail with the original error.
  • Head changes: this head is the recheck workflow's own base refresh of 54fd24b, made after chore(deps): update agent skills (plugins/agentic-engineering/skills/code-review) #694 merged. Codex also reviewed 54fd24b and found no issues.

@devantler
devantler marked this pull request as ready for review November 12, 2026 09:56
@devantler
devantler merged commit 73bb7e4 into main Nov 12, 2026
24 checks passed
@devantler
devantler deleted the claude/recheck-conflict-skip branch November 12, 2026 09:56
@github-project-automation github-project-automation Bot moved this from 🫴 Ready to ✅ Done in 🌊 Project Board Nov 12, 2026
This was referenced Nov 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Recheck open PRs reports a conflicting PR as a failure on main

1 participant