Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

conan-io / conan Public

Notifications You must be signed in to change notification settings
Fork 993
Star 8.4k

Code
Issues 996
Pull requests 41
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

fix conflict message#16137

Merged

czoido merged 2 commits intoconan-io:develop2conan-io/conan:develop2from memsharded:fix/conflict_msgmemsharded/conan:fix/conflict_msgCopy head branch name to clipboard

Apr 26, 2024

+31-22

Conversation Commits2 (2)Checks Files changed

Commits

Commits on Apr 23, 2024

fix conflict message
memsharded
committed
fix test
memsharded
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.