merge_tree: proper check for subdirectory #4977
Open
Conversation
This file contains 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
|
We require contributors to sign our Contributor License Agreement and we don't have one on file for @woutdenolf. In order for us to review and merge your code, please e-sign the Contributor License Agreement PDF. We then need to manually verify your signature, merge the PR (conda/infrastructure#806), and ping the bot to refresh the PR. |
woutdenolf
force-pushed
the
4976-merge_tree-bug-in-checking-for-subdirectory
branch
from
f86cee9
to
5c9eeb3
Compare
|
@conda-bot check-cla |
woutdenolf
force-pushed
the
4976-merge_tree-bug-in-checking-for-subdirectory
branch
from
5c9eeb3
to
7d11395
Compare
conda-bot
added
the
cla-signed
|
For reference, this is a fix of another fix: #1546 |
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.
Description
Closes #4976
Checklist - did you ...
newsdirectory (using the template) for the next release's release notes?