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.

Sign up for GitHub

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

Jump to bottom

Fix duplicate presets #14296

Merged
merged 2 commits into from
Jul 18, 2023
Merged

Fix duplicate presets #14296

merged 2 commits into from
Jul 18, 2023

Conversation

wayneph01
Copy link
Contributor

@wayneph01 wayneph01 commented Jul 13, 2023 •
edited by czoido
Loading

Changelog: Bugfix: ConanPresets.json contains duplicate presets if multiple user presets inherit from the same conan presets.
Docs: Omit

fixes #13968

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

@CLAassistant
Copy link

CLAassistant commented Jul 13, 2023 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@memsharded memsharded added this to the 2.0.9 milestone Jul 17, 2023
@memsharded memsharded self-assigned this Jul 18, 2023
memsharded
memsharded approved these changes Jul 18, 2023
View reviewed changes
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks! Merging this for next 2.0.9 release

@memsharded memsharded merged commit 9075b95 into conan-io:develop2 Jul 18, 2023
@memsharded memsharded mentioned this pull request Jul 18, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@memsharded memsharded memsharded approved these changes

Assignees

@memsharded memsharded

Labels
None yet
Projects
None yet
Milestone
2.0.9
Development

Successfully merging this pull request may close these issues.
3 participants
@wayneph01 @CLAassistant @memsharded