Django: Best way to merge migrations conflicts
The simplest way to do this without any worry is this:
- Revert to a stable point (before conflicts):
python manage.py migrate usersmaster 0021_signup_status
Delete new migration files.
Re-make migrations:
python manage.py makemigrations
When you are ready, you should merge from master to your development branch. At that time you should fix all conflicts, your migrations should go after master's migrations, and after all of that your database should look as you want it be like.
Since that process takes time, and is quite painful, most people consider short living development branches. That way you need to deal with one or two migration files at a time.
From the Django docs:
Because migrations are stored in version control, you’ll occasionally come across situations where you and another developer have both committed a migration to the same app at the same time, resulting in two migrations with the same number.
Don’t worry - the numbers are just there for developers’ reference, Django just cares that each migration has a different name [emphasis added].