Playbook 06 — one feature, one branch, one MR per repo #22

2026-09-05T01:40:58Z

jschoubben commented

2026-09-05 01:40:58 +00:00

Adds the branching-and-merging workflow to the process playbooks, and dogfoods it (this PR is itself a single feat/<slug> branch, one repo, one MR).

What it records — the rule that prevents the MR sprawl from this session:

One feature = one feat/<slug> branch, the same name in every repo it touches.
Each repo isolated in a .work/<slug>/<repo> worktree off main.
Commit as you go, but push nothing and open no MR mid-feature.
When the whole feature is done (all repos, tests green): push and open one MR per repo, together; merge promptly once approved (ADR 0042); leave no branch or worktree behind.

Files

00-META/process/06-feature-branches.md — the playbook (trigger, the failure it prevents, the rule, how it is checked).
00-META/process/00-overview.md — playbook row 06.
AGENTS.md — ground-rule pointer + workflow list entry.

Written against the failure it names (sixteen stacked intermediate MRs consolidated by hand), with a "how it is checked" section per the repo's own rule.

https://claude.ai/code/session_01LrgweAeERJYBg88c5cKDzF

Adds the branching-and-merging workflow to the process playbooks, and dogfoods it (this PR is itself a single `feat/<slug>` branch, one repo, one MR). **What it records** — the rule that prevents the MR sprawl from this session: - One feature = one `feat/<slug>` branch, the **same name in every repo** it touches. - Each repo isolated in a `.work/<slug>/<repo>` worktree off `main`. - Commit as you go, but **push nothing and open no MR mid-feature**. - When the whole feature is done (all repos, tests green): push and open **one MR per repo**, together; merge promptly once approved (ADR 0042); leave no branch or worktree behind. **Files** - `00-META/process/06-feature-branches.md` — the playbook (trigger, the failure it prevents, the rule, how it is checked). - `00-META/process/00-overview.md` — playbook row 06. - `AGENTS.md` — ground-rule pointer + workflow list entry. Written against the failure it names (sixteen stacked intermediate MRs consolidated by hand), with a "how it is checked" section per the repo's own rule. https://claude.ai/code/session_01LrgweAeERJYBg88c5cKDzF

jschoubben added 1 commit 2026-09-05 01:40:58 +00:00

Playbook 06 — one feature, one branch, one MR per repo cabe873503

Records the branching-and-merging workflow for code changes across the mesh
repos, written against a failure it names: branches and MRs opened per unit of
thought, treated as done when opened not merged, and named differently per repo,
so they pile up unmerged — one session left sixteen to consolidate by hand. The
rule is one feat/<slug> shared across every repo a feature touches, isolated in
.work/<slug>/<repo> worktrees off main, pushed and opened as one MR per repo only
when the whole feature is done, then merged promptly. Adds the ground-rule
pointer in AGENTS.md and the row in the process overview.

Claude-Session: https://claude.ai/code/session_01LrgweAeERJYBg88c5cKDzF

jschoubben merged commit 69fa79c585 into main

2026-09-05 01:47:26 +00:00

jschoubben deleted branch feat/feature-branch-workflow

2026-09-05 01:47:26 +00:00

jschoubben referenced this issue from a commit

2026-09-23 21:44:33 +00:00

Issue 103 resolved by mesh-host #22

jschoubben referenced this pull request

2026-09-23 21:44:44 +00:00

Design 25: the bus on NATS — proposed architecture for review; issue 103 resolved #93

jschoubben referenced this issue from a commit

2026-09-25 22:38:08 +00:00