multiple leaf nodes in the migration graph

[westfood]

Ahoj,

tohle teď bude při updatech pravidlem? Ten merge teď udělám, ale jestli je to korektní nebo ne.

Conflicting migrations detected; multiple leaf nodes in the migration graph: (0005_merge_20170224_1434, 0005_auto_20170226_1305 in www).

[westfood]

(seeder) [rudolf@war Seeder]$ ./manage.py makemigrations --merge
Merging www
  Branch 0005_merge_20170224_1434
    - Change Meta options on topiccollection
  Branch 0005_auto_20170226_1305
    - Remove field sources from topiccollection
    - Delete model TopicCollection

Merging will only work if the operations printed above do not conflict
with each other (working on different fields or models)
Do you want to merge these migration branches? [y/N] y

Created new merge migration /opt/Seeder/Seeder/www/migrations/0006_merge_20170227_1408.py

[Visgean]

ne, to neni pravidlem, idealne az se to bude nasazovat tak smaznu vsechny migrace a udelam je vsechny kompletne od znova.

[westfood]

cajkoš.