With this merging a branch with a diverged migration tree will cause a source control conflict, as both main and the branch attempt to modify the same thing. This will alert the user to discard one the migration trees and create a new, unified migration.
With this merging a branch with a diverged migration tree will cause a source control conflict, as both main and the branch attempt to modify the same thing. This will alert the user to discard one the migration trees and create a new, unified migration.