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…