chore(skills): disable squash merge in setup-repo#76
Merged
Conversation
Adds Step 3: PATCH the repo to set allow_squash_merge=false, allow_rebase_merge=true, allow_merge_commit=true. Squash-merge silently drops Co-Authored-By trailers and replaces the bot primary authorship with the merger. Today, that erased amcheste co-author credit on PRs #25 and #26 in pokemon-red-ai and put amcheste-ai-agent[bot] (the App identity, not the bot user account) as sole author of the squash commits. The skill update prevents the wrong button from being clickable on any new repo. Existing repos were updated out-of-band via direct PATCH calls (15 amcheste/* + 3 amcheste-ai-agent/*). Step numbering: old Steps 4/5/6 shift to 5/6/7. Summary updated to surface the merge-policy line. Refs: docs/philosophies/merge-strategy.md (handbook, pending PR) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-Authored-By: amcheste <13696614+amcheste@users.noreply.github.com>
amcheste
approved these changes
Apr 26, 2026
Owner
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.
Summary
Adds Step 3 to
setup-repo: disable squash merging at the repo level, set rebase as the default merge style, keep merge commits enabled as a fallback for ceremonial merges (e.g. CLI--no-ffdevelop → mainreleases).Why
Squash-merging PRs silently:
Co-Authored-By: amchestetrailers entirelyThat happened today on pokemon-red-ai#25 and #26: the squash commits ended up authored by
amcheste-ai-agent[bot](the App identity, not the bot user account), with no co-author trailers, and@amchestegot zero contribution-graph credit.Rebase merge preserves per-commit authorship and trailers, so each bot commit lands on the default branch with
@amchesteas a structurally-recognized co-author (verified via GraphQLCommit.authors).The skill update closes the gap on new repos. Existing repos (15
amcheste/*+ 3amcheste-ai-agent/*) were already updated out-of-band via direct PATCH calls.Changes
Test plan
/setup-repoagainst a new test repo and confirm the merge settings are appliedRelated
docs/philosophies/merge-strategy.md— the philosophy doc that motivates this rule (separate PR coming)