Conversation
pulls.merge() defaults to a merge commit, which 405s
("Merge commits are not allowed on this repository") on any repo
configured to disallow them, e.g. apify/apify-ai-agent. Read the
repo's allowed merge methods and pick the first available, merge
preferred so unaffected callers keep today's behavior.
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.
What
sync_branches.yaml's merge step now reads the repo's allowed mergemethods (
allow_merge_commit/allow_squash_merge/allow_rebase_merge)and passes the first available as
merge_method, preferringmergesoexisting callers see no behavior change.
Why
pulls.merge()defaults to a merge commit. On any repo configured todisallow merge commits the API 405s with "Merge commits are not allowed
on this repository", and the sync job fails outright — no PR ever gets
merged, so the branches drift.
Hit in apify/apify-ai-agent: apify/apify-ai-agent#81 failed on this,
went stale/conflicting, worked around manually in
apify/apify-ai-agent#82.
Testing
No test harness covers the embedded
github-scriptblock. Verified thescript is syntactically valid (
node --check) and diffed the changedown to a 15-line, backward-compatible addition.