Skip to content

Commit a61da26

Browse files
committed
[FIX] add missing alembic merge-heads migration + ignore .claude/
The upstream sync merge (45a3faa) brought in war_room_teams_and_chat_attachments on a sibling branch to the dashboard/collab merge head, re-forking the alembic head into two (b5c6d7e8f9a0, f7a3b9c1d02e) without a reconciling migration.
1 parent 45a3faa commit a61da26

2 files changed

Lines changed: 29 additions & 0 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ certificates/web_certificates/*.key
3434
local_dev/
3535
.serena/
3636
.tokensave
37+
.claude/
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
"""Merge dashboard/collab merge head and war_room_teams head
2+
3+
The upstream sync merge brought in war_room_teams_and_chat_attachments
4+
(f7a3b9c1d02e), based on d5e6f7a8b9c0, on a sibling branch to the
5+
dashboard/collab merge head (b5c6d7e8f9a0), re-forking the alembic
6+
head into two.
7+
8+
Revision ID: 0508647a855c
9+
Revises: b5c6d7e8f9a0, f7a3b9c1d02e
10+
Create Date: 2026-07-13 00:00:00.000000
11+
12+
"""
13+
from alembic import op
14+
import sqlalchemy as sa
15+
16+
# revision identifiers, used by Alembic.
17+
revision = '0508647a855c'
18+
down_revision = ('b5c6d7e8f9a0', 'f7a3b9c1d02e')
19+
branch_labels = None
20+
depends_on = None
21+
22+
23+
def upgrade():
24+
pass
25+
26+
27+
def downgrade():
28+
pass

0 commit comments

Comments
 (0)