chore: back-merge the #210 release into develop - #212
Merged
Merged
Conversation
release(sofra): partner brand (S1 + S3a) — publishes images, does NOT deploy
Release #210 merged as a merge commit, so main's tip is not on develop and the `main-develop` ruleset's strict up-to-date rule would refuse the next release PR before anyone read it — which is what #210 itself hit today, costing a back-merge (#211) mid-release. Content-clean: no main-only files, `git diff --stat origin/develop origin/main` empty. A real merge commit, not a squash — the ancestry link is the whole point. This changes nothing running: sofrapiwas.com still serves 663fba9. #210 publishes images only; the hand-roll that applies the partner-brand migration is a separate decision and has not been taken. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
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
1 participant
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.
Release #210 merged as a merge commit, so
main's tip is not ondevelop. Under themain-developruleset's strict up-to-date rule the next release PR is then refused before anyone reads it — which is exactly what #210 hit today, costing a back-merge (#211) mid-release. Closing it now rather than rediscovering it then.Content-clean, verified rather than assumed:
git diff --diff-filter=A --name-only origin/develop origin/main— no main-only filesgit diff --stat origin/develop origin/main— emptygit diff --stat origin/develop HEAD— emptyMust land as a merge commit; a squash keeps the (empty) content and drops the ancestry link, which is the only thing this PR is for.
This changes nothing running.
sofrapiwas.comstill serves663fba9. #210 publishes images only — the hand-roll that appliesprisma/migrations/20260830120000_partner_brandagainst the control-plane database is a separate decision and has not been taken.🤖 Generated with Claude Code