Resolve migration conflict

keshav-space · keshav-space · commit 11c417af8220 · 2025-01-10T16:15:22.000+05:30
Signed-off-by: Keshav Priyadarshi &lt;git@keshav.space&gt;
diff --git a/vulnerabilities/migrations/0087_update_alpine_advisory_created_by.py b/vulnerabilities/migrations/0087_update_alpine_advisory_created_by.py
@@ -28,7 +28,7 @@ def reverse_update_created_by(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("vulnerabilities", "0085_alter_package_is_ghost_alter_package_version_rank_and_more"),
+        ("vulnerabilities", "0086_codefix"),
     ]
 
     operations = [
diff --git a/vulnerabilities/tests/test_data_migrations.py b/vulnerabilities/tests/test_data_migrations.py
@@ -884,8 +884,8 @@ def test_update_pysec_created_by_field(self):
 
 class TestUpdateAlpineAdvisoryCreatedByField(TestMigrations):
     app_name = "vulnerabilities"
-    migrate_from = "0085_alter_package_is_ghost_alter_package_version_rank_and_more"
-    migrate_to = "0086_update_alpine_advisory_created_by"
+    migrate_from = "0086_codefix"
+    migrate_to = "0087_update_alpine_advisory_created_by"
 
     advisory_data1 = AdvisoryData(
         aliases=["CVE-2020-13371337"],

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ def reverse_update_created_by(apps, schema_editor):`
`28`	`28`	`class Migration(migrations.Migration):`
`29`	`29`
`30`	`30`	`dependencies = [`
`31`		`- ("vulnerabilities", "0085_alter_package_is_ghost_alter_package_version_rank_and_more"),`
	`31`	`+ ("vulnerabilities", "0086_codefix"),`
`32`	`32`	`]`
`33`	`33`
`34`	`34`	`operations = [`