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

Added support for recipes conflict #464

Merged
merged 1 commit into from Jan 6, 2019

Conversation

Projects
None yet
6 participants
@HeahDude
Copy link
Member

commented Dec 20, 2018

Allows to ignore incompatible recipes, helpful to avoid breaking apps using FrameworkBundle LTS versions.

flex_conflict

Unlocks symfony/recipes#506.

We need to update the Symfony bot to allow the conflict key in the manifest.json, ping @fabpot :).

Show resolved Hide resolved src/Flex.php Outdated
Show resolved Hide resolved src/Flex.php Outdated
Show resolved Hide resolved src/Flex.php Outdated
Show resolved Hide resolved src/Flex.php Outdated

@HeahDude HeahDude force-pushed the HeahDude:recipe-conflicts branch 2 times, most recently from ce7f468 to 1124dca Dec 20, 2018

Show resolved Hide resolved src/Flex.php Outdated
Show resolved Hide resolved src/Flex.php Outdated

@HeahDude HeahDude force-pushed the HeahDude:recipe-conflicts branch 2 times, most recently from 8f5e0ac to 4d69c55 Dec 20, 2018

Show resolved Hide resolved src/Flex.php Outdated

@HeahDude HeahDude force-pushed the HeahDude:recipe-conflicts branch 4 times, most recently from 37c3bf0 to 3b3ef7e Dec 20, 2018

Show resolved Hide resolved src/Flex.php Outdated

@HeahDude HeahDude force-pushed the HeahDude:recipe-conflicts branch from 3b3ef7e to 9a4eb6c Dec 20, 2018

@HeahDude

This comment has been minimized.

Copy link
Member Author

commented Dec 20, 2018

Last comments addressed, thanks for the review guys.

@weaverryan I've updated the screenshot in the description.

@HeahDude HeahDude force-pushed the HeahDude:recipe-conflicts branch from 9a4eb6c to 7ae43a1 Dec 20, 2018

@fabpot

fabpot approved these changes Jan 6, 2019

@fabpot

This comment has been minimized.

Copy link
Member

commented Jan 6, 2019

Thank you @HeahDude.

@fabpot fabpot merged commit 7ae43a1 into symfony:master Jan 6, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details

fabpot added a commit that referenced this pull request Jan 6, 2019

feature #464 Added support for recipes conflict (HeahDude)
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.

![flex_conflict](https://user-images.githubusercontent.com/10107633/50301402-803ba780-0487-11e9-87f5-55a2a37591ee.jpeg)

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

@HeahDude HeahDude deleted the HeahDude:recipe-conflicts branch Jan 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.