Repository navigation
[6.36] Fix off-by-one error for merging nested directories - #23883
Merged
Merged
Conversation
Instead of comparing the *file* of the source directory to the target directory, we should be comparing it to the *file* of the target directory. (cherry picked from commit 2ebe327)
Regression test for root-project#23666 Co-authored-by: Vincenzo Eduardo Padulano <v.e.padulano@gmail.com> (cherry picked from commit 43064e0)
enirolf
added
the
experiment
enirolf
changed the title
Test Results 15 files 15 suites 2d 5h 42m 55s ⏱️ Results for commit 958e71f. |
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.
Backport of #23878