Skip to content

chore: document master/dev/next branch model + wire CI triggers - #709

Merged
johnleider merged 2 commits into
masterfrom
worktree-branch-model-docs
Jul 23, 2026
Merged

chore: document master/dev/next branch model + wire CI triggers#709
johnleider merged 2 commits into
masterfrom
worktree-branch-model-docs

Conversation

@johnleider

@johnleider johnleider commented Jul 23, 2026

Copy link
Copy Markdown
Member

Adopts the git-flow release model and documents it. Companion to the PR base-branch audit (routed 13 feature PRs to dev, kept fixes on master).

Model

master = patch/fix + publish · dev = features (minor) · next = breaking (major). Only master publishes via changesets; dev/next accumulate work and merge into master at the next minor/major cut.

Changes

  • CLAUDE.md — Branch Model table + promotion rules under ## Releasing.
  • apps/docs contributing### Branch Model section; base-branch guidance in Before Submitting and Branch Naming.
  • pr-checks.yml / changeset-reminder.yml — now trigger on PRs into dev/next too (were master-only), so feature/breaking PRs get CI + the changeset nudge.
  • release.yml — comment only; publish stays master-only by design (no trigger change).

.changeset/config.json baseBranch: master left unchanged — correct under this model (master is the release base).

Notes

  • codecov-health gate in pr-checks stays master-only (coverage badge tracks the released branch).

Adopt the git-flow release model (master=patch/publish, dev=minor,
next=major; dev/next merge into master to ship). Only master publishes.

- CLAUDE.md: add Branch Model table + promotion rules under Releasing
- docs/contributing: Branch Model section, base-branch guidance in
  Before Submitting and Branch Naming
- pr-checks.yml, changeset-reminder.yml: run on PRs into dev/next too
- release.yml: comment that master-only publish is intentional
- add .github/PULL_REQUEST_TEMPLATE.md with a base-branch checklist
@johnleider johnleider added this to the v1.0.x milestone Jul 23, 2026
@johnleider johnleider added the documentation Improvements or additions to documentation label Jul 23, 2026
@johnleider johnleider self-assigned this Jul 23, 2026
Base-branch guidance lives in CLAUDE.md + contributing; a template
form adds friction without reliably being filled in.
@johnleider
johnleider marked this pull request as ready for review July 23, 2026 15:51
@johnleider
johnleider merged commit 70ea0ab into master Jul 23, 2026
21 checks passed
@johnleider
johnleider deleted the worktree-branch-model-docs branch July 23, 2026 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant