How to manage Migrations in a project with multiple branches?

Question

I have an ASP.NET MVC3 project that uses Entity Framework 4.3 with the code-first approach. I use Migrations to keep the database up-to-date.

The project is under so

Answer 1

Consider using a different migration library that doesn't cause these conflicts, such as FluentMigrator or Migrator.NET.

I don't think EF migrations are really ready for general use with branches & merges - it's a lot of work, and too easy to make nasty mistakes.