B-21667 & B-21487 MAIN #14288
Merged
B-21667 & B-21487 MAIN #14288
Conversation
This file contains 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
Bundle StatsHey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle. As this PR is updated, I'll keep you updated on how the bundle size is impacted. Total
Changeset
View detailed bundle breakdownAdded
Removed
Bigger No assets were bigger Smaller No assets were smaller Unchanged
|
|
Heads up I resolved a lot of these conflicts in the upstream @traskowskycaci , don't worry about resolving them until the upstream is merged. Once merged the fix will be in the git history |
|
Alternatively you can merge the upstream B-21374 into your PR now and it'll resolve them like that, I did that just now with #14342 |
I'll merge in 21374 - just brought it in yesterday to resolve some test fails so shouldn't be too bad! Thanks for the heads up @cameroncaci |
|
#14100 upstream to this pr is next, advise merging it in to help resolve the current conflicts |
cameroncaci
approved these changes
Dec 11, 2024
TevinAdams
approved these changes
Dec 11, 2024
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.
Important
Please ensure the upstreams are merged into main first:
B-21374
B-21375
B-21376
This main branch contains commits from all the below integration PRs. I combined B-21667 and B-21487, because the rename of a variable in B-21487 was the cause of some of the issues needing fixed.
B-21667 INT PR
B-21487 INT PR
B-21667 I-13550 INT PR
B-21667 I-13567 INT PR
B-21667 I-13574 INT PR