Better support for dependencies with conflicting migrations

[jathak]

Right now, if a dependency is migrated in multiple ways by multiple entrypoints, the migrator will error with a message that's not particularly helpful.

This should instead display the diff between the two migrations, and ideally give the user a choice of which one to use if the migrator is running in a terminal.