Commit 45ed19de authored by Tim Graham's avatar Tim Graham
Browse files

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

parent 491d01b7

django/core/management/commands/makemigrations.py

+2 −1
Original line number Diff line number Diff line
@@ -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

            )

django/core/management/commands/migrate.py

+2 −1
Original line number Diff line number Diff line
@@ -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

            )