p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25047 -- Improved "Conflicting migrations" error message.

This commit is contained in:
Tim Graham 2015-08-20 18:56:57 -04:00
parent 491d01b7e9
commit 45ed19de68
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management/commands/makemigrations.py
View File

@ -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
)

3
django/core/management/commands/migrate.py
View File

@ -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
)