Repository navigation
fix(web): diffs that turn a file into a folder no longer crash the file tree - #50
Merged
Merged
Conversation
…le tree A diff that deletes a file (often a symlink) and adds files under the same path as a folder handed Pierre's tree both a file and a directory at one path, and resetPaths threw "Path collides with an existing file". The tree now leaves out the replaced file; the folder's files carry the change, and the diff body still shows the deletion.
github-actions
Bot
added
vouch:trusted
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A diff that deletes a file (often a symlink) and adds files under the same
path as a folder handed Pierre's tree both a file and a directory at one
path, and resetPaths threw "Path collides with an existing file".
The tree now leaves out the replaced file; the folder's files carry the
change, and the diff body still shows the deletion.