docs: document signed-merge policy (squash/merge, not rebase)#2
Merged
Conversation
main is kept signed/Verified on GitHub. Rebase-merge re-creates the merged commit without a signature (it left one unverified commit on main); squash and merge-commit are GitHub-signed. Document the policy in CONTRIBUTING so future merges keep main verified. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.
What
Adds a Merging section to
CONTRIBUTING.md:mainis kept signed/Verified on GitHub, so PRs should be merged with Squash and merge or Create a merge commit (both GitHub-signed). Rebase and merge re-creates the merged commit without a signature.Why
PR #1 was merged via rebase, which left its merged commit (
ff5d296) unverified onmain. Re-signing an existing commit requires a force-push, whichmain's branch protection (mirrored from agent-capsules) correctly blocks. Documenting the merge method prevents recurrence — and merging this PR via squash or merge-commit restores a signed/Verified HEAD onmain.Note on merging this PR
Please merge with Squash and merge or Create a merge commit (not Rebase) so the new HEAD is GitHub-signed.
🤖 Generated with Claude Code