Added support for recipes conflict #464
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
HeahDude
force-pushed
the
recipe-conflicts
branch
2 times, most recently
from
ce7f468
to
1124dca
Compare
HeahDude
force-pushed
the
recipe-conflicts
branch
2 times, most recently
from
8f5e0ac
to
4d69c55
Compare
HeahDude
force-pushed
the
recipe-conflicts
branch
4 times, most recently
from
37c3bf0
to
3b3ef7e
Compare
nicolas-grekas
approved these changes
Dec 20, 2018
weaverryan
reviewed
Dec 20, 2018
weaverryan
approved these changes
Dec 20, 2018
HeahDude
force-pushed
the
recipe-conflicts
branch
from
3b3ef7e
to
9a4eb6c
Compare
|
Last comments addressed, thanks for the review guys. @weaverryan I've updated the screenshot in the description. |
HeahDude
force-pushed
the
recipe-conflicts
branch
from
9a4eb6c
to
7ae43a1
Compare
maxhelias
approved these changes
Dec 20, 2018
chalasr
approved these changes
Dec 21, 2018
fabpot
approved these changes
Jan 6, 2019
|
Thank you @HeahDude. |
fabpot
added a commit
that referenced
this pull request
Jan 6, 2019
This PR was merged into the 1.2-dev branch. Discussion ---------- Added support for recipes conflict Allows to ignore incompatible recipes, helpful to avoid breaking apps using FrameworkBundle LTS versions.  Unlocks symfony/recipes#506. We need to update the Symfony bot to allow the `conflict` key in the `manifest.json`, ping @fabpot :). Commits ------- 7ae43a1 Added support for recipes conflict
tgalopin
pushed a commit
to tgalopin/flex
that referenced
this pull request
Dec 3, 2020
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.
Allows to ignore incompatible recipes, helpful to avoid breaking apps using FrameworkBundle LTS versions.
Unlocks symfony/recipes#506.
We need to update the Symfony bot to allow the
conflictkey in themanifest.json, ping @fabpot :).