Skip to content

Standardize on rebase merges #7

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
ccf merged 1 commit into from
Sep 14, 2026
Merged

Standardize on rebase merges #7

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
8 changes: 5 additions & 3 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ Never run bare `ruff format .` — ruff 0.16 formats Python fences inside
## Workflow

Branch → PR to `main`. `main` is protected (admins included): no direct pushes,
the four CI jobs must pass on an up-to-date branch, and every review thread
must be resolved — so after fixing a Bugbot finding, resolve its thread (GraphQL
`resolveReviewThread`) before merging. CI runs pre-commit, pytest (3.9 and
linear history required, the four CI jobs must pass on an up-to-date branch, and
every review thread must be resolved — so after fixing a Bugbot finding, resolve
its thread (GraphQL `resolveReviewThread`) before merging. Merge with
`gh pr merge --rebase` (rebase is the only enabled method; merged branches are
deleted automatically). Tag releases on `main` after the merge (`vX.Y.Z`). CI runs pre-commit, pytest (3.9 and
3.13), and plugin validation; Cursor Bugbot reviews every PR and re-reviews on
push. Pre-commit hooks run on every commit; never `--no-verify`. After merging a plugin change:
`claude plugin marketplace update humanize && claude plugin update humanize@humanize`.
Expand Down
Loading