Add django-migration-git-conflict to prevent divergent migration merg…

…es (#4075)
WordPress · Apr 16, 2024 · 173686e · 173686e
1 parent e90b146
commit 173686e
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 1 deletion.
diff --git a/api/Pipfile b/api/Pipfile
@@ -27,6 +27,7 @@ Django = "~=4.2"
 django-asgi-lifespan = "~=0.1"
 django-cors-headers = "~=4.2"
 django-log-request-id = "~=2.0"
+django-migrations-git-conflicts = "~=1.0"
 django-oauth-toolkit = "~=2.3"
 django-redis = "~=5.4"
 django-split-settings = "*"

diff --git a/api/Pipfile.lock b/api/Pipfile.lock
diff --git a/api/conf/settings/base.py b/api/conf/settings/base.py
@@ -12,6 +12,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "migrations_git_conflicts",
 ]
 
 MIDDLEWARE = [

diff --git a/api/latest_migrations/README b/api/latest_migrations/README
@@ -0,0 +1,7 @@
+The contents of this directory is autogenerated and shouldn't be modified
+manually. It stores the latest migration of each of the installed applications.
+When two git branches are merged, and they contain different sets of migrations,
+a merge migration has to be applied on top of them. This is enforced by putting
+the name of the latest migration to the file in this directory, and if two
+branches have different migrations, there will be a conflict in this file which
+will stop git from doing an unsafe merge.
diff --git a/api/latest_migrations/api b/api/latest_migrations/api
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+0058_moderation_decision
diff --git a/api/latest_migrations/corsheaders b/api/latest_migrations/corsheaders
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+
diff --git a/api/latest_migrations/django.contrib.admin b/api/latest_migrations/django.contrib.admin
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+0003_logentry_add_action_flag_choices
diff --git a/api/latest_migrations/django.contrib.auth b/api/latest_migrations/django.contrib.auth
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+0012_alter_user_first_name_max_length
diff --git a/api/latest_migrations/django.contrib.contenttypes b/api/latest_migrations/django.contrib.contenttypes
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+0002_remove_content_type_name
diff --git a/api/latest_migrations/django.contrib.messages b/api/latest_migrations/django.contrib.messages
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+
diff --git a/api/latest_migrations/django.contrib.sessions b/api/latest_migrations/django.contrib.sessions
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+0001_initial
diff --git a/api/latest_migrations/django.contrib.staticfiles b/api/latest_migrations/django.contrib.staticfiles
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+
diff --git a/api/latest_migrations/drf_spectacular b/api/latest_migrations/drf_spectacular
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+
diff --git a/api/latest_migrations/migrations_git_conflicts b/api/latest_migrations/migrations_git_conflicts
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+
diff --git a/api/latest_migrations/oauth2_provider b/api/latest_migrations/oauth2_provider
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+0007_application_post_logout_redirect_uris
diff --git a/api/latest_migrations/rest_framework b/api/latest_migrations/rest_framework
@@ -0,0 +1,5 @@
+# This file is autogenerated by makemigrations.
+# If you have a merge conflict in this file, it means you need to run:
+#     manage.py makemigrations --merge
+# in order to resolve the conflict between migrations.
+