bugfix: reuse unique type guids on merge conflicts #5332
Merged
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.
Overview
Fixes #5331
This PR amends a merge branch (i.e. a branch that we create to resolve a merge conflict) to include dependents and conflicts.
Previously, all dependents and conflicts would be omitted from the underlying namespace. This had the unfortunate consequence of regenerating unique type GUIDs for all unique types that are either conflicted or the dependent of a conflict.
Test coverage
I've added a transcript to cover this change