docs: switch house git workflow from squash to merge commits #3

Merged

TJC merged 1 commit from ai/docs/merge-commit-workflow into main

2026-08-15 16:07:32 +01:00

AGit

Bolt commented

2026-08-15 16:06:13 +01:00

Collaborator

Summary

CLAUDE.md: PRs now land on main via a merge commit; branch commits survive, so no WIP commits
commit-style: branch commits are permanent history, amend or rebase them away before pushing
pr-style: the PR title names the merge commit on main
matches the already-updated ~/.claude/CLAUDE.md copy

Test plan

tests/run.sh passes (ascii lint, git-message lint, repo ASCII scan)

## Summary - CLAUDE.md: PRs now land on main via a merge commit; branch commits survive, so no WIP commits - commit-style: branch commits are permanent history, amend or rebase them away before pushing - pr-style: the PR title names the merge commit on main - matches the already-updated ~/.claude/CLAUDE.md copy ## Test plan - tests/run.sh passes (ascii lint, git-message lint, repo ASCII scan)

Bolt added 1 commit

2026-08-15 16:06:13 +01:00

docs: switch house git workflow from squash to merge commits b764f8aa63

- CLAUDE.md: branch commits now land on main verbatim, no WIP commits
- commit-style: commits are permanent history, clean up before pushing
- pr-style: the PR title names the merge commit