﻿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
28351	"""Conflicting migrations detected"" CommandError due to replacement Migration being removed"	Daniel Hahler	Windson yang	"I am getting the following error:
{{{
CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0002_initial_models, 0XXX_merge_20170628_1435 in myapp).
To fix them run 'python manage.py makemigrations --merge'
}}}

Running the command results in `No conflicts detected to merge.` however.

`0002_initial_models` is not actually a leaf node, but `0003_initial_data` depends on it.
`0003_initial_data` however is removed, since it replaces `0XXX_merge_20170628_1435`, which is not applied yet and therefore also does not show up in `showmigrations`?!
(it gets removed in https://github.com/django/django/blob/a6756195c1a11eee10c16c96fe95d52e22e1d9ba/django/db/migrations/graph.py#L252)

I think `0003_initial_data` should still show up in `showmigrations`, but with some indication that it replaces other migrations.
That would happen in case it wasn't removed as a leaf node in https://github.com/django/django/blob/a6756195c1a11eee10c16c96fe95d52e22e1d9ba/django/core/management/commands/showmigrations.py#L82-L83."	Bug	closed	Migrations	1.11	Normal	needsinfo			Accepted	0	0	0	0	0	0
