fix: resolve renamed paths on merge editor #254677
Merged
Conversation
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
Contributor
Author
|
@microsoft-github-policy-service agree |
hediet
approved these changes
Oct 15, 2025
Member
|
Thanks for the PR! |
Tyriar
approved these changes
Oct 15, 2025
hediet
force-pushed
the
fix-rename-merge-editor
branch
from
00f9d18 to
20e7ba7
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Fixes file path resolution when clicking the
Open merge editorbutton when the incoming branch has renamed the conflicted file.This was partially fixed by #209542, which correctly resolved the paths on the incoming ("theirs") branch when the file has been renamed in the current ("ours") branch. But the issue persisted for the opposite case (file was renamed in the incoming branch).
Closes #161321