fix(db): merge feedback + language alembic heads#7285
Merged
Conversation
PRs #7142 and #7143 both branched from 3a7e1b5c0c4f and merged to main independently, leaving two alembic heads. Sync: PostgreSQL has been failing on every push to main since ~17:55 with "Multiple head revisions are present for given argument 'head'". Add a no-op merge revision (7efe9fc8bde1) joining both heads so `alembic upgrade head` resolves again. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a no-op Alembic merge revision joining the two heads (c5f9a3d72be1 from the language descriptions branch and e5b1c9d4a7f2 from the feedback widget branch) into a single new head 7efe9fc8bde1, restoring alembic upgrade head resolution and unblocking the Sync: PostgreSQL workflow on main.
Changes:
- New Alembic merge revision file with empty
upgrade/downgradeanddown_revisiontuple pointing at both prior heads.
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
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.
Problem
Sync: PostgreSQLhas been failing on every push tomainsince ~17:55 with:PRs #7142 (language descriptions) and #7143 (feedback widget) both branched from `3a7e1b5c0c4f` and merged independently, leaving two alembic heads:
c5f9a3d72be1— update_language_descriptionse5b1c9d4a7f2— feedback_uuid_and_statusNo merge revision was added, so
alembic upgrade headis ambiguous. Production DB is stuck on whatever was the last successful sync.Fix
Add a no-op merge revision `7efe9fc8bde1` joining both heads. Verified locally:
Test plan
Sync: PostgreSQLworkflow goes green on the next push tomain🤖 Generated with Claude Code