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

Feature/alias #6236

Merged
merged 32 commits into from Dec 20, 2019
Merged

Feature/alias #6236

merged 32 commits into from Dec 20, 2019

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Dec 15, 2019

Changelog: Bugfix: Avoid raising a version conflict error when aliases have not been resolved yet, typically for aliased build-requires that are also in the requires.
Docs: Omit

Close: #5468

@memsharded memsharded requested review from czoido and jgsogo Dec 16, 2019
Copy link
Member

@jgsogo jgsogo left a comment

I would modify that bit of code, fewer lines. But it looks good.

conans/client/graph/graph_builder.py Outdated Show resolved Hide resolved
czoido
czoido approved these changes Dec 16, 2019
jgsogo
jgsogo approved these changes Dec 17, 2019
@lasote lasote merged commit 4196525 into conan-io:develop Dec 20, 2019
2 checks passed
@memsharded memsharded deleted the feature/alias branch Dec 20, 2019
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.

4 participants