Skip to content

chore(skills): disable squash merge in setup-repo #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amcheste merged 1 commit into from
Apr 26, 2026
+29 −4
Merged

chore(skills): disable squash merge in setup-repo #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions claude-skills/setup-repo/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,31 @@ gh api repos/<owner/repo> \
--jq '.default_branch'
```

## Step 3 — Protect develop
## Step 3 — Set merge policy: disable squash, default to rebase

Squash-merging is destructive when bot-authored PRs are merged by a human:
the squash commit replaces the bot's primary authorship with the merger, and
GitHub silently drops the `Co-Authored-By` trailers (so the human steering
the bot loses contribution-graph credit, and `git blame` no longer reflects
who actually wrote the code). Rebase merge preserves per-commit authorship
and trailers; merge commits stay enabled as a fallback for ceremonial merges
like the CLI `--no-ff` `develop → main` release promotion.

```bash
gh api repos/<owner/repo> \
--method PATCH \
--field allow_squash_merge=false \
--field allow_rebase_merge=true \
--field allow_merge_commit=true \
--jq '{allow_squash_merge, allow_rebase_merge, allow_merge_commit}'
```

The convention alone isn't enough — without disabling squash at the repo
level, the wrong button eventually gets clicked. See
[engineering handbook → merge strategy](https://github.com/amcheste/engineering-handbook/blob/main/docs/philosophies/merge-strategy.md)
for the full reasoning.

## Step 4 — Protect develop

Require a PR and status checks before merging. Check if `.github/workflows/validate.yml` exists in the repo to know which checks to require:

Expand Down Expand Up @@ -84,7 +108,7 @@ gh api repos/<owner/repo>/branches/develop/protection \
EOF
```

## Step 4 — Protect main
## Step 5 — Protect main

Require a PR before merging. No direct pushes. No Commit Lint check required here (the develop→main release PR is a `chore:` commit which is valid, but having it as a required check on main is redundant).

Expand All @@ -109,7 +133,7 @@ gh api repos/<owner/repo>/branches/main/protection \
EOF
```

## Step 5 — Tag protection ruleset
## Step 6 — Tag protection ruleset

Prevent accidental creation, deletion, or force-moving of `v*` tags:

Expand All @@ -136,7 +160,7 @@ gh api repos/<owner/repo>/rulesets \
EOF
```

## Step 6 — Verify CODEOWNERS routing
## Step 7 — Verify CODEOWNERS routing

Bot-authored PRs (via the `amcheste-ai-agent` GitHub App) need
`.github/CODEOWNERS` to auto-route review requests to a human reviewer.
Expand Down Expand Up @@ -169,6 +193,7 @@ Report what was configured (and any gaps that need a follow-up PR):
```
✓ develop branch created (or already existed)
✓ develop set as default branch
✓ Merge policy: squash disabled, rebase + merge enabled
✓ develop protected — require PR + [checks]
✓ main protected — require PR + [checks]
✓ Tag ruleset active — v* tags protected
Expand Down
Loading