JS: Resolve conflicts after merging 'main' into shared data flow branch #17285
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
These files conflicted and have been regenerated.
asgerf
force-pushed
the
js/shared-dataflow-bump
branch
from
8ec2eb4 to
a2dd47a
Compare
|
The QLDoc check failure can be ignored, as it is caused by compilation errors on the target branch (which doesn't compile due to the merge conflicts that are resolved in this PR). |
erik-krogh
approved these changes
Aug 23, 2024
asgerf
merged commit 379952f
into
github:js/shared-dataflow-merge-main
7 of 8 checks passed
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.
As usual, targeting
js/shared-dataflow-merge-mainwhich containsjs/shared-dataflow-branchwithmainmerged into it.Some of the relevant changes on
mainthat needed fixups:TEarlyStageNodestage.subpathsrefactoring.