Django's Migration Headache: Fixing InconsistentMigrationHistory

You've been working hard on your feature branch. You run git pull, merge the latest changes, and try to run migrate. Suddenly, your terminal screams at you with an InconsistentMigrationHistory error. You check your migrations folder and see the probl...