diff options
| author | Tim Graham <timograham@gmail.com> | 2015-08-20 18:56:57 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-08-24 08:05:21 -0400 |
| commit | 45ed19de687d324d3ba852eea93b1afa575e482f (patch) | |
| tree | ec4b86a69a830ebe5599d619dc5808ee9e134ec4 | |
| parent | 491d01b7e9e4244ff904af387f97e39b46786b5e (diff) | |
Fixed #25047 -- Improved "Conflicting migrations" error message.
| -rw-r--r-- | django/core/management/commands/makemigrations.py | 3 | ||||
| -rw-r--r-- | django/core/management/commands/migrate.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/django/core/management/commands/makemigrations.py b/django/core/management/commands/makemigrations.py index f218c417c0..da5a2bd257 100644 --- a/django/core/management/commands/makemigrations.py +++ b/django/core/management/commands/makemigrations.py @@ -80,7 +80,8 @@ class Command(BaseCommand): for app, names in conflicts.items() ) raise CommandError( - "Conflicting migrations detected (%s).\nTo fix them run " + "Conflicting migrations detected; multiple leaf nodes in the " + "migration graph: (%s).\nTo fix them run " "'python manage.py makemigrations --merge'" % name_str ) diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py index 2f048240b5..622627142f 100644 --- a/django/core/management/commands/migrate.py +++ b/django/core/management/commands/migrate.py @@ -94,7 +94,8 @@ class Command(BaseCommand): for app, names in conflicts.items() ) raise CommandError( - "Conflicting migrations detected (%s).\nTo fix them run " + "Conflicting migrations detected; multiple leaf nodes in the " + "migration graph: (%s).\nTo fix them run " "'python manage.py makemigrations --merge'" % name_str ) |