id	summary	reporter	owner	description	type	status	component	version	severity	resolution	keywords	cc	stage	has_patch	needs_docs	needs_tests	needs_better_patch	easy	ui_ux
24155	Make migration generation more deterministic	Tomas Dobrovolny	Markus Holtermann	"When you have an application and run makemigrations command twice, generated content of migration file is different (order of generated function call parameters etc). Thus, it is very difficult to merge changes from two development branches together.

Workflow
2) run makemigrations
3) move generated migration somewhere (app/migrations/0001_initial.py to /tmp/)
4) run makemigrations again
5) compare generated migration with moved one (diff app/migrations/0001_initial.py with /tmp/0001_initial.py

You got almout all line of code is different."	Cleanup/optimization	closed	Migrations	1.7	Normal	fixed			Accepted	1	0	0	0	0	0