ea0cd3b455
Scopes the second of E's remaining pieces: migration-collision preflight, keep-ours merge driver for generated files, and the single sanctioned origin/development-into-feature-branch merge. Agents and F's integrations stay out of scope, per the roadmap's own subsystem split.