Or, “the inevitable renumbering and conflict-resolution of miggy tardust”
This is a tool to help merge rails branches with conflicting migrations. The basic idea goes like this:
First you migrate down to the migration you were at when you branched. Renumber any new migrations you created that conflict with any new migrations in the target branch. Commit the renames. Merge to the target branch (usually ‘master’). Migrate back up. Read the full article