fix(alembic): merge diverged migration heads#13094
Merged
Merged
Conversation
github-actions
Bot
added
size:S
seedspirit
marked this pull request as ready for review
July 23, 2026 13:24
seedspirit
added
the
skip:changelog
Contributor
There was a problem hiding this comment.
Pull request overview
Adds an empty Alembic merge migration to restore a single manager schema head.
Changes:
- Merges revisions
339ae21cb8ecand39fadbbea696. - Adds a changelog fragment.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/ai/backend/manager/models/alembic/versions/5405ee0d8eed_merge_heads_339ae21cb8ec_and_.py |
Defines the empty merge revision. |
changes/13094.misc.md |
Records the migration-head reconciliation. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
fregataa
approved these changes
Jul 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
339ae21cb8ecand39fadbbea696.Root cause
Two independently merged migrations both used
b3e8f1a24c76as theirdown_revision, leavingmainwith two Alembic heads.Developer impact
Manager schema upgrades can target
headagain without Alembic reporting multiple heads.Test plan
./py -m alembic -c alembic.ini heads --verbose./py -m alembic -c alembic.ini history -r b3e8f1a24c76:headspants fmt ::pants fix ::pants lint --changed-since=origin/main