The version of Entity Framework that is EF Core 2 and better allows for merge conflicts with migrations to be resolvable.

This was not doable in Entity Framework 6 as if two developers were checking in two branches to merge that each had a migration there was not a way to make sense of the ordering and basically one of the two developers had to back down in the short term. The ordering is now, in modernity, kept in a JSON file and you can obviously do merges against that.