Skip to content

Commit 7adc9df

Browse files
si1verwind17claude
andcommitted
DEVELOPMENT.md: merge as one commit per independent change
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent 3eed44e commit 7adc9df

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

‎DEVELOPMENT.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,12 @@ and `node scripts/motion-shots.mjs <dir>`.
136136
stale build, guide or demo page.
137137
3. **Eval** only when agent behaviour changes: `SKILL.md`, `format.md`, the scanner or its packs. A viewer-only
138138
change skips it.
139-
4. **Merge.** Squash the branch into `main` as one commit whose message says what changed and why. Delete the
140-
branch after checking it holds nothing the squash left out (`git diff <branch> main` is empty); it needs
141-
`git branch -D`, as a squash does not mark it merged.
139+
4. **Merge.** Land the branch on `main` as one commit per independent change, each message saying what changed and
140+
why. Fold review fixes and other follow-ups into the change they fix. A branch with one change lands as one squashed
141+
commit; one with several (say, a worker and a cache) lands as several, so a later bisect or revert can single one
142+
out. Messages and docs name the change itself, never the branch or a plan's task numbers: neither outlives the
143+
merge. Delete the branch after checking it holds nothing the merge left out (`git diff <branch> main` is empty);
144+
it needs `git branch -D`, as the rebuilt commits do not mark it merged.
142145
5. **Release.** On a clean `main`, bump the version by what the release brings (semver):
143146

144147
```

0 commit comments

Comments
 (0)