chore: reconcile main into beta (recover from mis-targeted #1710 squash)#1716
Merged
Conversation
…1710) When the photo metadata panel opens on mobile, the toggle button now renders inside the panel header instead of staying pinned at the bottom-right, eliminating overlap with the form inputs. Fixes #1706 Co-Authored-By: Claude frontend-developer (Haiku 4.5) <[email protected]> Co-Authored-By: Claude qa-integration-tester (Sonnet 4.5) <[email protected]> Co-Authored-By: Claude e2e-test-engineer (Sonnet 4.5) <[email protected]>
Contributor
|
🎉 This PR is included in version 2.8.0-beta.26 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Contributor
|
🎉 This PR is included in version 2.8.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
Why
PR #1710 was squash-merged with base=main instead of beta. Its beta-based branch dragged 251 files of in-flight beta work onto main as commit `6d68c1c7`, and `v2.7.1` was tagged from it. This left `main` with a commit beta lacks, making the beta→main promotion PR #1700 conflicting.
What this does
Merges `origin/main` into `beta` so beta becomes a clean descendant of main, unblocking the proper promotion (which will cut v2.8.0).
PhotoMetadataSidepanel.tsxis byte-identical to main's, and beta contains every file path main has.SearchPicker.tsxto drop a staleuseMemoimport that auto-merged in from main's old version).e2e-test-engineer/MEMORY.md, +131 lines from main) — not production code.Merge strategy