For those of you that don’t stalk follow my other streams:

Migration Buddy

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.

Wow, what a pain, right? (Apologies to Saul Williams, you rock).

I keep threatening, but I may have to replace this blog with a combination twitter / tumblr / github stream.