Skip to content

01a0919c - Draft Ready pull requests that have merge conflicts - #95

Merged
TaprootFreak merged 6 commits into
developfrom
feat/01a0919c-ready-conflicts-draft
Sep 12, 2026
Merged

TaprootFreak merged 6 commits into
developfrom
feat/01a0919c-ready-conflicts-draft

Conversation

@TaprootFreakAI

Copy link
Copy Markdown
Collaborator

EN:
Ready pull requests with confirmed merge conflicts always return to Draft, including when a write collaborator holds Ready.
Write-hold still applies only to missing or red CI.
Scheduled all-open sweeps use a separate concurrency group so pull-request events cannot starve them.

DE:
Ready-PRs mit bestätigten Merge-Konflikten gehen immer auf Draft, auch wenn ein Write-Collaborator Ready hält.
Write-Hold gilt weiter nur für fehlende oder rote CI.
Geplante All-Open-Sweeps laufen in einer eigenen Concurrency-Gruppe, damit PR-Events sie nicht verdrängen.

Details

Conflicts: REST mergeable === false, or GraphQL CONFLICTING when REST is null. UNKNOWN does not invent a conflict.

Write-hold is re-applied on the pre-mutation re-read if conflicts disappeared and only red/missing CI remains.

Restore after an auto-draft requires REST mergeable === true and no conflicts.

Example workflow: concurrency groups event vs sweep (schedule or dispatch with all_open); sweep timeout 45 minutes.

Write-hold still covers red or missing CI only. Scheduled all-open
sweeps use a separate concurrency group so pull events cannot starve
them.
@TaprootFreakAI
TaprootFreakAI force-pushed the feat/01a0919c-ready-conflicts-draft branch from bf532af to 45c9ab4 Compare September 12, 2026 06:16
@TaprootFreakAI

Copy link
Copy Markdown
Collaborator Author

EN:
Grok and Codex quality and logic reviews are complete with 0 findings at this head after iterated passes.
Ready pull requests with merge conflicts always return to Draft, including under write-hold.

DE:
Grok- und Codex-Qualität und -Logik sind an diesem Head nach mehreren Durchläufen bei 0 Mängeln.
Ready-PRs mit Merge-Konflikten gehen immer auf Draft, auch bei Write-Hold.

Details

Head ec2e795990caefabb5416b7cffc3fdbde7f7ff24.

Lanes at this head: Grok quality 0, Grok logic 0, Codex quality 0, Codex logic 0.

Write-hold remains for missing or red CI only. Confirmed conflicts (REST mergeable === false, or GraphQL CONFLICTING when REST is null) always return Ready to Draft. Scheduled all-open sweeps use a separate concurrency group from pull-request events.

@TaprootFreakAI
TaprootFreakAI marked this pull request as ready for review September 12, 2026 07:35
@TaprootFreak
TaprootFreak merged commit c4a88ed into develop Sep 12, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants