Check out alembic's neat solution to this: http://alembic.readthedocs.org/en/latest/tutorial.html#worki...

Basically you can solve the problem by fixing the order manually after merging code. And it won't run until you resolve the ordering.