Clean up conflicts for sylius/sylius #14964
Merged
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
jakubtobiasz
force-pushed
the
remove-conflicts
branch
from
6918fd8
to
508e39d
Compare
probot-autolabeler
bot
added
Admin
jakubtobiasz
force-pushed
the
remove-conflicts
branch
from
508e39d
to
d4d4eb8
Compare
jakubtobiasz
force-pushed
the
remove-conflicts
branch
from
d4d4eb8
to
d7f2080
Compare
GSadee
approved these changes
Apr 21, 2023
jakubtobiasz
changed the title
NoResponseMate
approved these changes
Apr 24, 2023
Rafikooo
approved these changes
Apr 26, 2023
GSadee
approved these changes
Apr 27, 2023
|
Thanks, Jacob! 🎉 |
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.
As we usually bump dependencies version in minor versions of Sylius, I've prepared a cleanup of conflicts for the
sylius/syliuspackage. Also, we should do the same for every package (as some packages have conflict fortwig/twig:^1.0when it cannot be installed).