From 5bc640ec8272ea296fecb1708bee6e2672d1c514 Mon Sep 17 00:00:00 2001 From: Brian O'Kelley Date: Sun, 26 Apr 2026 16:47:25 -0400 Subject: [PATCH] =?UTF-8?q?fix(migrations):=20renumber=20duplicate=20436?= =?UTF-8?q?=5Forganization=5Fmembership=20=E2=86=92=20437?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Third parallel-merge collision today. PRs #3294 (addie_prompt_telemetry) and #3295 (organization_membership_provisioning_source) both landed as 436_*.sql. The migration runner throws on duplicate version numbers, so production startup is broken on main and every PR's "No duplicate migration numbers" check fails again. Renumber organization_membership_provisioning_source (the second-merged, 16:19 UTC) to 437. addie_prompt_telemetry stays at 436 (16:09 UTC). The CI hardening from #3288 closes the parallel-merge gap going forward but doesn't retroactively fix existing collisions on main. Co-Authored-By: Claude Opus 4.7 (1M context) --- .changeset/fix-dup-migration-436.md | 4 ++++ ...ql => 437_organization_membership_provisioning_source.sql} | 0 2 files changed, 4 insertions(+) create mode 100644 .changeset/fix-dup-migration-436.md rename server/src/db/migrations/{436_organization_membership_provisioning_source.sql => 437_organization_membership_provisioning_source.sql} (100%) diff --git a/.changeset/fix-dup-migration-436.md b/.changeset/fix-dup-migration-436.md new file mode 100644 index 0000000000..aa22742e25 --- /dev/null +++ b/.changeset/fix-dup-migration-436.md @@ -0,0 +1,4 @@ +--- +--- + +Renumber `436_organization_membership_provisioning_source.sql` → `437_organization_membership_provisioning_source.sql` to break a third parallel-merge migration collision (after the 433 and 434 incidents earlier today). PR #3294 (`addie_prompt_telemetry`) merged at 16:09 UTC and PR #3295 (`organization_membership_provisioning_source`) at 16:19 UTC, both claiming version 436. Standard policy: rename the second-merged file. The CI fix from #3288 (which closes the parallel-merge gap) only catches *future* collisions; existing dups on main still need this manual unstick. diff --git a/server/src/db/migrations/436_organization_membership_provisioning_source.sql b/server/src/db/migrations/437_organization_membership_provisioning_source.sql similarity index 100% rename from server/src/db/migrations/436_organization_membership_provisioning_source.sql rename to server/src/db/migrations/437_organization_membership_provisioning_source.sql