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.
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