I’ve been looking into using the built-in database migration system in CakePHP with Sphynx. One area that I can’t seem to find mentioned in either documentation or use cases is dealing with merging migration files from multiple branches in a repository.
Since the migration files are generated using a timestamp, there should be no collisions in the actual merge. However, I am uneasy proceeding, even with testing, without knowing if out-of-order migrations are expected to happen.
We can control migration actions conflicting by enforcing unrelated database changes in branches, but is it ok to allow multiple migrations to merge into a master branch and then back out to feature branches? The timestamps for migrations will surely get out-of-order at some point.
If the last migration applied to a database has a file timestamp later than a new migration merged and applied, is that unsupported?