Resolve generated-artifact conflicts at the source

When a merge conflict lands in a generated snapshot, resolve the canonical source files first and regenerate the artifact; choosing “ours” or “theirs” can silently discard valid changes or preserve a stale hash. This applies when the repository has a deterministic generator and a parity check. It does not apply to hand-authored artifacts or generators with nondeterministic/external inputs, where regeneration may need additional review.

A safe sequence is: preserve both source histories according to their canonical ordering rules, run the repository-owned generator, verify no conflict markers or unmerged paths remain, then run the generator’s check mode and focused consumer tests.

Evidence/example — 2026-09-09

In e3-solutions/theft PR #822, merging current staging conflicted in a hand-authored caught-bug register and its derived load-investigation knowledge snapshot. Preserving both register additions, ordering them newest-first, and regenerating the snapshot produced a clean resolved tree; the knowledge check and 80 focused tests passed. Provenance: local Git merge against origin/staging commit 1fc69cec and repository-owned generator/test output. This is historical evidence, not current PR status.