Skip to content

fix(migrations): renumber duplicate 436 → 437 (third parallel-merge collision) #3301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bokelley wants to merge 1 commit into from
Closed

fix(migrations): renumber duplicate 436 → 437 (third parallel-merge collision) #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changeset/fix-dup-migration-436.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
0 ...zation_membership_provisioning_source.sql → ...zation_membership_provisioning_source.sql
View file
Open in desktop
File renamed without changes.
Loading