Kaydet (Commit) 45ed19de authored tarafından Tim Graham's avatar Tim Graham

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

üst 491d01b7
......@@ -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
)
......
......@@ -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
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment