From fee43b73989bc7d02edb7ca5f4f7a5b373dcfb93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E8=BE=B0=E5=8B=87?= <exinglang@gmail.com>
Date: Thu, 23 Jul 2026 22:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=20alembic=20=E4=B8=A4=E4=B8=AA=20head(no-op=20merge=20?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

本分支的 guide_video_play_table 与 main 的 8e04cc13a211 都挂在
(comparison_user_created_idx, monitoring_audit_rbac, notification_table)
这三条线之上,合并 main 后并列成两个 head,`upgrade head` 会直接报
Multiple head revisions。加一个空的 merge 节点收成单 head,不改表结构。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ...erge_guide_video_and_main_alembic_heads.py | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 alembic/versions/d9c03cc3ea07_merge_guide_video_and_main_alembic_heads.py

diff --git a/alembic/versions/d9c03cc3ea07_merge_guide_video_and_main_alembic_heads.py b/alembic/versions/d9c03cc3ea07_merge_guide_video_and_main_alembic_heads.py
new file mode 100644
index 0000000..0834cae
--- /dev/null
+++ b/alembic/versions/d9c03cc3ea07_merge_guide_video_and_main_alembic_heads.py
@@ -0,0 +1,26 @@
+"""merge guide_video and main alembic heads
+
+Revision ID: d9c03cc3ea07
+Revises: 8e04cc13a211, guide_video_play_table
+Create Date: 2026-07-23 22:57:40.998161
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'd9c03cc3ea07'
+down_revision: Union[str, Sequence[str], None] = ('8e04cc13a211', 'guide_video_play_table')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass