Multi branch migration
Hello guys,
I'm trying to figure out how to merge two branches where the migration journal has diverged. They both have a 004 migration and a 004 snapshot, so I'm not sure if I'm meant to renumber them or... not? Do I re-generate the snapshots somehow?
Joe
1 Reply
Damn. I don't know there is a recommended approach
I would stash my changes, apply them again, drop the last migration, merge the incomming changes, fix possible merge conflicts in the schema files, generate migration again