fix: upstream merge - preserve gitignored local data, refuse a merge git never opened (4.5.0-beta.3, #30)

Files changed: - CHANGES.md - VERSION - docs/ownership-and-templates.md - instructions/gates.md - instructions/private-instance.md - tools/CONTRACT.md - tools/chemenu/commands/upstream_cmd.py - tools/chemenu/tests/test_upstream_cmd.py
2026-09-04 07:35:00 +02:00
parent d2b1719a4b
commit 1b5ffea854
8 changed files with 259 additions and 32 deletions
@@ -131,6 +131,12 @@ Everything else under `kb/`, `raw/`, `work/` and `reports/` is yours, `kb/CONVEN
 each `kb/<name>/COLLECTION.md` included - they bind your corpus, and they are exactly what
 `upstream merge` protects.

+**Your local, uncommitted-by-design files under those stages survive.** Forcing a content stage
+back to your own state removes only what git tracks, never the directory wholesale - which
+matters because `reports/` is gitignored apart from its contract, so it holds data that is in no
+commit and cannot be recomputed: the telemetry traces `eval score` reads, saved eval reports,
+past lint reports. A merge has no business touching any of it, and does not.
+
 The command itself checks its own result the same way `upstream verify` would, immediately
 after committing, and refuses loudly - without rolling the commit back - if anything landed
 outside a stack-owned path. A refusal there is a bug report, not something to work around by