From ab8872f79e5d885609e5ecec81affab160e70299 Mon Sep 17 00:00:00 2001
From: Fusion <noreply@runfusion.ai>
Date: Fri, 22 May 2026 21:44:43 +0200
Subject: [PATCH] fix: add merge migration to resolve multiple alembic heads

Resolves conflict between numeric migration branch (0013) and
tool-workshop migration branch (8ed7dd80973d) both depending on
0012_default_port_req.
---
 apps/api/alembic/versions/0014_merge_heads.py | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 apps/api/alembic/versions/0014_merge_heads.py

diff --git a/apps/api/alembic/versions/0014_merge_heads.py b/apps/api/alembic/versions/0014_merge_heads.py
new file mode 100644
index 0000000..aeb08c7
--- /dev/null
+++ b/apps/api/alembic/versions/0014_merge_heads.py
@@ -0,0 +1,25 @@
+"""merge migration heads
+
+Revision ID: 0014_merge_heads
+Revises: 0013_add_probe_result, 8ed7dd80973d
+Create Date: 2026-05-22 21:50:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision: str = "0014_merge_heads"
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = ("0013_add_probe_result", "8ed7dd80973d")
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass