Skip to content

chore(fork): daily sync merges its own PRs when nothing blocks them - #26

Merged
tebiggs merged 1 commit into
mainfrom
chore/fork-sync-auto-merge
Nov 2, 2026
Merged

tebiggs merged 1 commit into
mainfrom
chore/fork-sync-auto-merge

Conversation

@tebiggs

@tebiggs tebiggs commented Nov 2, 2026

Copy link
Copy Markdown
Owner

The daily sync opened a PR for a one-line import conflict and then left it waiting, even though all its checks passed. The sync's rules told it never to merge.

The sync now merges its own sync-conflict/* and fix/fork-* PRs once nothing blocks them. These block a merge: a failed check, a review requesting changes, a conflict with main, or a resolution that changes how a FORK.md feature behaves. It merges with a merge commit pinned to the commit the checks passed on. dedup/* PRs still wait for review because they remove a fork feature.

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@tebiggs
tebiggs merged commit 4fa1249 into main Nov 2, 2026
12 checks 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.

1 participant