Commit 4d4ea654 authored by Moayad Mardini's avatar Moayad Mardini Committed by Tim Graham
Browse files

[1.7.x] Fixed #22692 -- Added docs for `makemigrations` two command options. 

Added documentation about `--dry-run` and `--merge`.

Backport of e98d3035 from master
parent 22d33d52

docs/ref/django-admin.txt

+9 −0
Original line number Diff line number Diff line
@@ -650,6 +650,15 @@ for advanced users and should not be used unless you are familiar with 
the migration format, migration operations, and the dependencies between

your migrations.



.. django-admin-option:: --dry-run



The ``--dry-run`` option shows what migrations would be made without

actually writing any migrations files to disk.



.. django-admin-option:: --merge



The ``--merge`` option enables fixing of migration conflicts.



migrate [<app_label> [<migrationname>]]

---------------------------------------