docs: single-trunk on main; drop stale development-branch guidance - #74
Merged
Conversation
Contributors were being sent to a dead branch. CONTRIBUTING.md, CLAUDE.md, and the PR template all told people to branch from and target `development`, but that branch has been frozen ~27 commits behind `main` since the v0.4.0 era — everything actually ships from `main` (which is now protected with required CI + review). This misdirection directly caused PRs #68, #69, and #70 (all three first-time-contributor PRs open right now) to be cut from a stale base, show 60+ unrelated files, and become unmergeable. Changes: - CONTRIBUTING.md: branch from / target `main`; add a fork-sync snippet and a 'if your PR shows dozens of files, rebase' note. - PULL_REQUEST_TEMPLATE.md: target `main`; checklist item now asks the author to confirm the branch is rebased on current main. - CLAUDE.md: state that main is the single trunk. Follow-up (separate, maintainer action): delete the `development` branch now that no docs point at it. Signed-off-by: alphacrack <18480504+alphacrack@users.noreply.github.com>
github-actions
Bot
added
the
area:docs
9 tasks
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.
Why
Three first-time-contributor PRs open right now (#68, #69, #70) were all cut from a stale base and are unmergeable — because
CONTRIBUTING.md,CLAUDE.md, and the PR template told them to branch from and targetdevelopment, a branch frozen ~27 commits behindmainsince the v0.4.0 era. Everything actually ships frommain(now protected). This PR fixes the misdirection.Changes
main; add a one-time fork-sync snippet (git remote add upstream … && git fetch upstream) and a "if your PR shows dozens of files, rebase" troubleshooting note.main; the checklist now asks authors to confirm their branch is rebased on currentmain(diff shows only their files).mainis the single trunk.Follow-up (separate, needs maintainer)
Delete the
developmentbranch now that nothing points at it. Its 8 commits are old pre-squash v0.4.0 work already represented inmain.Checklist
Fixes the root cause behind #68, #69, #70 base confusion.