docs: point branching/release sections at engineering handbook#73
Merged
docs: point branching/release sections at engineering handbook#73
Conversation
Owner
Author
Replaces the Branch Model, Commit Convention, and Release Process sections with a pointer to the canonical engineering-handbook docs. Repo-specific content (shellcheck/act prerequisites, Brewfile.ci parity rule, acceptance test flow, fork guidance) is preserved.
amcheste
force-pushed
the
docs/point-contributing-at-handbook
branch
from
04f4607 to
4fa8929
Compare
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
Points the branching/release sections of `CONTRIBUTING.md` at the canonical engineering-handbook. Repo-specific content (shellcheck/act/tart prerequisites, `Brewfile.ci` parity rule, VM acceptance test flow, fork guidance) is preserved.
What was wrong
The old `Release Process` section said:
That contradicts the canonical rule (already correctly stated in this repo's `CLAUDE.md`) that `develop → main` must be a CLI `git merge --no-ff` — never a GitHub PR, because GitHub's merge button squash-merges by default and destroys commit ancestry, causing merge conflicts on every subsequent release.
Follow-ups (flagged for the user)
Test plan
🤖 Generated with Claude Code