This PR adjusts the PPE we use for rendering merge conflicts to prefer Alice's names when available (even for Bob's stuff). Previously, we'd render Alice's stuff preferring her names, and Bob's stuff preferring his names.
This makes merges easier to resolve as they will no longer have spurious differences in mergetools (or when merging manually) that could occur whenever Alice and Bob have different sets of aliases for the same term.
Test coverage
I've added a transcript that demonstrates the change
Overview
Fixes #5208
This PR adjusts the PPE we use for rendering merge conflicts to prefer Alice's names when available (even for Bob's stuff). Previously, we'd render Alice's stuff preferring her names, and Bob's stuff preferring his names.
This makes merges easier to resolve as they will no longer have spurious differences in mergetools (or when merging manually) that could occur whenever Alice and Bob have different sets of aliases for the same term.
Test coverage
I've added a transcript that demonstrates the change