Repository navigation
chore: Merge master into develop - #25845
Merged
Merged
Conversation
meta(changelog): Update changelog for 11.10.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
andreiborza
marked this pull request as ready for review
October 28, 2026 16:42
andreiborza
requested review from
Lms24,
chargome,
isaacs,
msonnb,
mydea and
nicohrubec
and removed request for
a team
October 28, 2026 16:42
JPeer264
approved these changes
Oct 28, 2026
Contributor
size-limit report 📦Compared: a866cb6 (PR test merge using develop at b382e30) Against: b382e30 (develop) · base run #63998 ✅ Baseline matches: this diff contains only this PR's changes.
|
Contributor
Optional E2E testsSome optional checks were not successful. They do not block the merge. 2 not successful, 65 successful. See the run.
Successful checks
|
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.
What
Merge
masterintodevelopafter the 11.10.0 release, with thepackage.jsonconflicts resolved. Supersedes #25842.Why
The automated gitflow PR conflicts because develop bumped
@sentry/conventionswhile master bumped the release versions. Merge this with "Create a merge commit", not squash.