docs: correct merge-policy to match squash-only config#96
Merged
Conversation
AGENTS.md described the repo as rebase-merge, but it is configured squash-only (squash_merge_commit_message=PR_BODY; rebase and merge-commit disabled). Fix 3.3, 3.5, and 3.7 to state the real policy: rebase only to freshen the branch before push, squash on merge. The squash commit body comes from the PR description and individual commit bodies are dropped, while GitHub auto-collects each commit's Co-authored-by -- so put Closes and reviewer context in the PR description, and keep the trailer in the commit (adding it to the PR description would duplicate it). Co-authored-by: Claude (claude-opus-4-8) <noreply@anthropic.com>
cyfyifanchen
approved these changes
Jul 7, 2026
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
AGENTS.md described the repo as rebase-merge, but it is configured squash-only (
squash_merge_commit_message=PR_BODY; rebase and merge-commit disabled). Correct 3.3, 3.5, and 3.7 to the real policy: rebase only freshens the branch before push, squash on merge; the squash commit body comes from the PR description (commit bodies are dropped), and GitHub auto-collects each commit'sCo-authored-by-- so keep the trailer in the commit and putCloses/ reviewer context in the PR description.Type
Verification
Docs-only. Policy verified against
gh api repos/EverMind-AI/Raven(squash-only,PR_BODY) and as observed on the #95 squash commit.Risk
Docs-only; no code or behavior change.
Related Issues
N/A