chore: document single-trunk flow, retire stale dev branch#29
Merged
Conversation
Reality drifted from the documented convention: CONTRIBUTING.md said to branch off `dev` (the "default working branch") and PR dev->main, but the last 8 PRs (#22-#28) all branched off `main` and merged feature branches straight into `main`. `dev` had fallen 46 commits behind main with 0 ahead — a vestigial, fully-merged branch. GitHub's default branch is already `main`. Align the doc to the actual single-trunk flow (branch off main into feat/*/fix/*, PR into main) and drop the now-dead `dev` entries from the CI push/pull_request branch filters. The stale `dev` branch is retired separately. 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.
Why
Audit of the
devbranch againstCONTRIBUTING.mdfound the documented convention no longer matches reality:dev(the default working branch)" and implied adev → mainflow.mainand merged feature branches straight intomain. Thedev → mainflow stopped after v0.2.0 (chore(release): v0.2.0 #20).devhad drifted 46 commits behindmain, 0 ahead — a fully-merged, vestigial branch. GitHub's default branch is alreadymain, andmainis protected by a ruleset (PR required).What
CONTRIBUTING.md: step 1 now reads "Branch offmaininto afeat/*orfix/*branch" — matching the real single-trunk flow. Step 5 (PR into protectedmain) was already correct and is unchanged..github/workflows/ci.yml: drop the now-deaddeventries from thepush/pull_requestbranch filters.The stale
devbranch itself is retired separately (deleted on origin + local), since it carries no unique commits.🤖 Generated with Claude Code