resolve conflicts: #24644 feat!: forbid external note validation checks - #24876
Closed
PhilWindle wants to merge 1 commit into
Closed
resolve conflicts: #24644 feat!: forbid external note validation checks#24876PhilWindle wants to merge 1 commit into
PhilWindle wants to merge 1 commit into
Conversation
Contributor
Author
|
Superseded by #24918 — the v5-next→next backlog is now one time-ordered forward-port PR with a single resolution PR on top, instead of fragmented per-PR pairs (the fragmentation broke commit dependencies). Closing. |
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.
Automated conflict-resolution attempt for #24863 (
fwd-port-24644). Merges next + v5-next PR #24644.Resolution summary
Two files had committed conflict markers; both hunks were trivial (one side empty), so the resolution is a clean union.
docs/docs-developers/docs/resources/migration_notes.md: kept next's## 5.0.1heading (incoming side was empty). The renamed-history-helpers note from feat!: forbid external note validation checks #24644 was already present below the conflict and is untouched. Union preserved.yarn-project/txe/esbuild/plugins/size_guard.mjs: kept the incoming bump-log line// - 2026-07-13: bumped total to 14.5 MiB.(next side was empty).Flag for human review
In
size_guard.mjs, the added bump-log comment says the total was bumped to 14.5 MiB, buttotalLimitMiBremains at next's value of14(that line was outside the conflict and unchanged on both sides). This inconsistency is inherited from the forward-port, not introduced here. Confirm whethertotalLimitMiBshould be raised to match the log entry, or the log line adjusted.No generated/pinned artifacts were involved, so no regeneration is required.
Confidence: high on the marker resolution; please verify the size-guard limit intent noted above.