When two branches independently generate the same numbered append-only migration, preserve the…
When two branches independently generate the same numbered append-only migration, preserve the target branch’s published migration and regenerate the feature branch’s schema delta from that updated snapshot as the next migration. Do not hand-merge generated snapshots or renumber …