你如何在非主分支上干净地维护django迁移？

Question

1. Imagine that I have a branch that has a migration. It's an experimental branch that keeps up with master, but will not be merged into it for a while, if ever.
2. Master migrations change over time.
3. The result is that when I merge in master, I end up with multiple migration leaves, meaning that manage.py migrate errors out. If I just do manage.py makemigrations --merge , then it creates a new leaf that will later also be out of date.

Is there a nice way to handle this? I'm tempted just to avoid having any migrations in long-lived dependent branches.

Answer 1

1. Rebase an experimental branch on top of master before merging it.

2. Unapply all migrations from the experimental branch:

    manage.py migrate <appname> <previousMigration> 

3. Delete all migrations from the experimental branch.

4. Create a brand new migration:

    manage.py makemigrations 

5. Commit changes to the experimental branch

6. Merge the experimental branch.

It's perfectly safe to delete migrations from a repository if no one else has applied them.