docs(claude): add Git Workflow section with stacked-PR lesson#134
Merged
Conversation
Records the rule "never commit directly to main" (mirroring dist/STRAYMARK.md §5 for adopters), branch/commit conventions, the project's squash-merge default, and the stacked-PR incident from #129/#131/#133 (2026-05-11) — including prevention strategies and a cherry-pick recovery recipe. Also documents when --admin merge is acceptable (procedural sync PRs where content was already reviewed elsewhere) and the tag-time version-match check that release-{cli,framework}.yml enforce. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Contributor
Author
|
recheck |
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
Adds a new `## Git Workflow` section to `CLAUDE.md` (between the framework release workflow and the CLI commands reference). Records:
identifiedstatus (closes #130) #131 / chore: sync cli-3.12.1 to main (cherry-pick from stranded #131) #133 incident (2026-05-11) — why stacking on a branch whose parent gets squash-merged strands the child's content, with prevention strategies and a cherry-pick recovery recipe.Test plan
🤖 Generated with Claude Code