Remove clashing duplicated file#109
Merged
ondrejmirtes merged 1 commit intophpstan:masterfrom Oct 14, 2020
Merged
Conversation
The file already exists here: https://github.com/phpstan/phpstan-src/blob/master/tests/PHPStan/Generics/data/bug2574.php This will clash and emit a warning on case insensitive file systems.
Member
|
This was already tried before: https://github.com/phpstan/phpstan-src/pull/84/files But it breaks the Windows build: https://travis-ci.org/phpstan/phpstan-src/jobs/641054293#L233 I think we have to remove the file including the test, and then add it again in another PR. |
Contributor
Author
|
You mean both files? |
Member
|
Yeah, probably :) |
Contributor
|
Easiest fix is probably just to rename the remaining file to |
0786c63 to
9395d76
Compare
dc2e229 to
1d0d3ad
Compare
Contributor
|
Or maybe do it in two commits? |
Member
|
Thank you! |
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
4 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.
The file already exists here: https://github.com/phpstan/phpstan-src/blob/master/tests/PHPStan/Generics/data/bug2574.php
This will clash and emit a warning on case insensitive file systems.