Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT Conflict with silverstripe/framework 5.1.0 #5

Merged
merged 1 commit into from
Sep 28, 2023

Conversation

GuySartorelli
Copy link
Owner

That version will require a new minor release of this module, which there's already a PR for, due to conflicts in the method signature of the new ArrayList::excludeAny() method and that method in the searchfilterable arraylist.

This is really just to make CI happy - in a real project the conflict won't be necessary since composer will just grab the most recent version anyway.

That version will require a new minor release of this module, which
there's already a PR for, due to conflicts in the method signature of
the new ArrayList::excludeAny() method and that method in the
searchfilterable arraylist.

This is really just to make CI happy - in a real project the conflict
won't be necessary since composer will just grab the most recent version
anyway.
@GuySartorelli
Copy link
Owner Author

Enough of the CI is passing to see that this is working as expected.

@GuySartorelli GuySartorelli merged commit 68184c4 into 2.0 Sep 28, 2023
16 checks passed
@GuySartorelli GuySartorelli deleted the pulls/2.0/conflict-with-51 branch September 28, 2023 01:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant