Fixed #24755 -- Hid operations from dependency apps when merging migrations

Thanks Carl Meyer for the report and Tim Graham for the review.

tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0001_initial.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    operations = [
+        migrations.CreateModel(
+            "Author",
+            [
+                ("id", models.AutoField(primary_key=True)),
+                ("name", models.CharField(max_length=255)),
+                ("slug", models.SlugField(null=True)),
+                ("age", models.IntegerField(default=0)),
+                ("silly_field", models.BooleanField(default=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            "Tribble",
+            [
+                ("id", models.AutoField(primary_key=True)),
+                ("fluffy", models.BooleanField(default=True)),
+            ],
+        )
+    ]

tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_conflicting_second.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("conflicting_app_with_dependencies", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            "Something",
+            [
+                ("id", models.AutoField(primary_key=True)),
+            ],
+        )
+    ]

tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_second.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("conflicting_app_with_dependencies", "0001_initial"),
+        ("migrated_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.DeleteModel("Tribble"),
+        migrations.RemoveField("Author", "silly_field"),
+        migrations.AddField("Author", "rating", models.IntegerField(default=0)),
+        migrations.CreateModel(
+            "Book",
+            [
+                ("id", models.AutoField(primary_key=True)),
+            ],
+        )
+    ]