chore: adopt two-tier flow — dev for development, main for releases#30
Merged
Conversation
Reverses the prior single-trunk doc: `dev` is now the everyday development branch and `main` is the protected release branch. Routine feature/fix work branches off `dev` and PRs into `dev`; `main` only receives `dev` via PR at release time, after which tags are cut from `main` (unchanged release rules). - CONTRIBUTING.md: branch off `dev`, PR target `dev`; `main` documented as the release branch. - .github/workflows/ci.yml: restore `dev` to the push/pull_request branch filters so dev pushes and PRs-into-dev run CI. - .claude/skills/confer-feature/SKILL.md: orchestrator pushes to `dev` (or a feature branch off dev) and opens PRs with `--base dev`. A repo-wide audit confirmed release.yml's origin/main release gate and the CLAUDE.md/AGENTS.md release rules already match this model and need no change. The `dev` branch is recreated from this updated `main` after merge. 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
Set the canonical branch model to
dev= everyday development,main= release. This reverses the short-lived single-trunk doc (PR #29) per maintainer direction. Routine feature/fix work branches offdevand PRs intodev;mainonly receivesdevvia PR at release time, after which tags are cut frommain.This PR lands the doc/CI/orchestrator changes on the default+release branch as a one-time bootstrap;
devis recreated from this updatedmainimmediately after merge.What (5 must-fix items from a repo-wide branch-flow audit)
CONTRIBUTING.md: branch offdev; PR targetdev;maindocumented as the protected release branch..github/workflows/ci.yml: restoredevto thepush/pull_requestbranch filters so dev pushes and PRs-into-dev run CI..claude/skills/confer-feature/SKILL.md: orchestrator pushes todev(or a feature branch offdev) and opens PRs with--base dev.What deliberately did NOT change (audit-confirmed already correct)
.github/workflows/release.yml— theorigin/mainrelease gate andv*tag trigger already encode "release from main". The hardcodedmainthere is correct and must stay.CLAUDE.md/AGENTS.mdrelease rules ("merge to main first, then tag") — already match; they are a sync pair.gen-release-notes.shpermalinks to/main— default branch staysmain, so correct.🤖 Generated with Claude Code