Currently, we have a set of migrations listed in the db. This is normally alright but becomes a huge hassle with merging a set of migrations from multiple sources. For example, if your fork is relatively far apart from master, your migrations can be quite different and ordering isn't consistent or even work correctly.

Part of the issue is that Rails migrations are a bit naive and part of it is that we need to split parts of the application up into separate parts. For example, could moving parts of the app into different Rails engines simplify this process? I'm not sure but anything we can do to simplify merging db migrations would be greatly appreciated.