cherry pick -Avoid namespace collisions when collapsing graph to custom node (#9330) 2.1 RC #9360
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.
Purpose
cherry pick:
#9330
Declarations
Check these if you believe they are true
*.resx
filesReviewers
@QilongTang - this looks much better now, matches the change amounts in the original PR.
I think what happened before was that the merge conflicts stopped the full list of commits from being applied, I'm not sure if you can continue a cherry pick on a conflicted squash commit like you can with regular commits - at least git did not tell me I needed to continue after the merge conflicts were fixed, so we should be cautious of cherry picking a squashed commit with conflicts atleast until we look into it a bit more.