From @tolomea again: If a feature branch has 2+ migrations in the same app, rebase-migration can't help with rebasing the migration. It should be possible to rebase an arbitrary linear chain of migrations by converting the existing code into higher-level abstractions.