Python 修复Django1.9中检测到的冲突迁移

我更新了存储库以支持Django 1.9。我得到了这个错误：

CommandError: 

Conflicting migrations detected; multiple leaf nodes in the migration
graph: (0001_initial, 0002_auto__add_field_dynamicschemafield_extra in
dynamicmodel).
To fix them run 'python manage.py makemigrations --merge'

运行

python manage.py makemigrations--merge

后，我遇到了另一个错误：

 File "/local/lib/python2.7/sitepackages/django/core/management/__init__.py",  
line 353, in execute_from_command_line
utility.execute()

 File "/local/lib/python2.7/sitepackages/django/core/management/__init__.py", line 345, in execute
self.fetch_command(subcommand).run_from_argv(self.argv)

 File 
"/local/lib/python2.7/site-packages/django/core/management/base.py", line 348, in run_from_argv
self.execute(*args, **cmd_options)

File 
"/local/lib/python2.7/site-packages/django/core/management/base.py", line 399, in execute
output = self.handle(*args, **options)

File 
"/local/lib/python2.7/site-packages/django/core/management/commands/makemigrations.py", line 97, in handle
return self.handle_merge(loader, conflicts)

File 
   "/local/lib/python2.7/site-packages/django/core/management/commands/makemigrations.py", line 216, in handle_merge
 raise ValueError("Could not find common ancestor of %s" % migration_names)


 ValueError: Could not find common ancestor of set([u'0001_initial', u'0002_auto__add_field_dynamicschemafield_extra']). 

---

帮我找到解决方案。

似乎您已经注入了其他应用程序的模型

---

在迁移中定义目标应用程序，似乎迁移加载器无法正确识别目标应用程序。

迁移需要有“直”依赖链，即迁移0003需要依赖于迁移0002，而0002依赖于迁移0001

您需要在0003_third.py中这样定义：

class Migration(migrations.Migration):
    dependencies = [
        ('modulename', '0002_second'),
    ]

---

什么是目标应用程序？我在Django 1.8上，尝试在

--merge

之后显式地给出应用程序名称，但这没有帮助。我看到，

TARGET\u app

是迁移文件中的一个变量，而不是迁移脚本的参数