Garry Tan b071df3579 fix: resolve merge conflicts with origin/main (v0.6.0 + v0.6.0.1 + v0.6.1) ...

Merge main's test bootstrap, boil-the-lake completeness principle,
selective expansion, ship gate overrides, and gstack-upgrade vendor sync.

Conflicts resolved:
- CHANGELOG: keep main's 0.6.1/0.6.0.1/0.6.0/0.5.4/0.5.3 entries
- VERSION: take main's 0.6.1
- design-consultation: office-hours naming + main's "what's out there" phrasing
- ship: keep both verification rules (fresh evidence + coverage tests)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-03-17 14:37:22 -07:00

..

references

feat: Phase 3.5 — cookie import, QA testing, team retro (v0.3.1) (#29)

2026-03-13 00:31:41 -07:00

templates

feat: Test Bootstrap + Regression Tests + Coverage Audit (v0.6.0) (#136)

2026-03-17 13:05:18 -05:00

SKILL.md

fix: resolve merge conflicts with origin/main (v0.6.0 + v0.6.0.1 + v0.6.1)

2026-03-17 14:37:22 -07:00

SKILL.md.tmpl

feat: Test Bootstrap + Regression Tests + Coverage Audit (v0.6.0) (#136)

2026-03-17 13:05:18 -05:00