This is partial revert of #7583 based on offline discussion with Mohamed Hegazy (@mhegazy) - we still block merging of value side to prevent runtime errors but now allow namespace\type aliases to be merged with matching local since otherwise it breaks existing code
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
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.
This is partial revert of #7583 based on offline discussion with Mohamed Hegazy (@mhegazy) - we still block merging of value side to prevent runtime errors but now allow namespace\type aliases to be merged with matching local since otherwise it breaks existing code