Standardize on rebase merges - #7
Merged
Merged
Conversation
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KTKYvLEVY4mStJ3iPaB1Mh
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
1 participant
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
Repository now allows only rebase merges (merge commits and squash disabled; merged branches auto-deleted) and
mainrequires linear history in addition to its existing protection (admins enforced, four CI checks on an up-to-date branch, conversation resolution). This PR records the policy inCLAUDE.md's Workflow section.Settings were changed via the API alongside this PR; this is the first PR merged under the new policy.
Test plan
gh api repos/ccf/humanize→allow_rebase_mergeonly;delete_branch_on_mergetruegh api repos/ccf/humanize/branches/main/protection→required_linear_history.enabledtrue, all prior rules unchangedgh pr merge --rebase🤖 Generated with Claude Code
https://claude.ai/code/session_01KTKYvLEVY4mStJ3iPaB1Mh
Note
Low Risk
Documentation-only update to the Workflow section; no runtime or CI code changes.
Overview
Documents the repo’s rebase-only merge policy in
CLAUDE.md:mainnow requires linear history, merges must usegh pr merge --rebase(merge commits and squash disabled; merged branches deleted automatically), and releases are tagged onmainafter merge (vX.Y.Z). Existing protection rules (admin enforcement, four CI checks on an up-to-date branch, resolved review threads) are unchanged aside from this wording.Reviewed by Cursor Bugbot for commit 9cf023b. Bugbot is set up for automated code reviews on this repo. Configure here.