Repository navigation
Switch from GitHub auto-merge to manual merge-after-ci skill - #26
Merged
Merged
Conversation
Renames auto-merge to merge-after-ci. Subscribe to the PR, merge it (merge commit, pinned to the head SHA) when check has passed and the PR is clean with no changes requested, and stay silent. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014k4kywyN5dAo39izUPvxbw
Replaces merge-after-ci. Checks CI and mergeability fresh, merges on request with a pinned head SHA, and replies in one line. No subscribing, no watching, no GitHub auto-merge. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014k4kywyN5dAo39izUPvxbw
This reverts commit 56dd6e9.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace the
auto-mergeskill with a newmerge-after-ciskill that handles PR merging differently.Summary
The bot now merges
claude/*PRs itself once CI passes, rather than relying on GitHub's auto-merge feature. This removes the dependency on repository settings ("Allow auto-merge") and thecheckrequired status.Changes
.claude/skills/auto-merge/SKILL.md: The old skill that enabled GitHub's auto-merge feature.claude/skills/merge-after-ci/SKILL.md: New skill that:mergeable_stateisclean, all checks pass, no blocking reviewsmerge_pull_requestwithexpectedHeadShato prevent race conditionsCLAUDE.md: Reflects the new merging approach and removes references to GitHub auto-merge configuration requirementsImplementation details
The new skill is more robust: it actively monitors PR state rather than passively relying on GitHub's auto-merge, and it can fix small CI issues by pushing fixes and waiting for the next check run. It never uses GitHub's auto-merge feature or the CI button's auto-merge boxes.
https://claude.ai/code/session_014k4kywyN5dAo39izUPvxbw