Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
Appearance settings
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
{{ message }}
CycloneDX
/
cyclonedx-cli
Public
Uh oh!
There was an error while loading.
Please reload this page
.
Notifications
You must be signed in to change notification settings
Fork
83
Star
548
Code
Issues
111
Pull requests
18
Actions
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Security and quality
Insights
merge: expose --component-conflict-resolution; handle RenameRef refusal
- #511
#511
Open
jimklimov
wants to merge 4 commits into
CycloneDX:main
CycloneDX/cyclonedx-cli:main
from
jimklimov:merge-conflict-resolution
jimklimov/cyclonedx-cli:merge-conflict-resolution
Copy head branch name to clipboard
Conversation
Commits
4
(4)
Checks
Files changed
Open
merge: expose --component-conflict-resolution; handle RenameRef refusal
#511
jimklimov
wants to merge 4 commits into
CycloneDX:main
CycloneDX/cyclonedx-cli:main
from
jimklimov:merge-conflict-resolution
jimklimov/cyclonedx-cli:merge-conflict-resolution
Copy head branch name to clipboard
Commits
Commits on Sep 15, 2026
Wire merge command to the new MergeStrategy
Show description for e937b62
jimklimov
committed
e937b62
View commit details
Copy full SHA for e937b62
Browse repository at this point
Add rename-entity command: rewrite a bom-ref and its back-references
Show description for 0cc43c2
jimklimov
committed
0cc43c2
View commit details
Copy full SHA for 0cc43c2
Browse repository at this point
Add regression tests for rename-entity
Show description for 8326d6e
jimklimov
committed
8326d6e
View commit details
Copy full SHA for 8326d6e
Browse repository at this point
Expose --component-conflict-resolution on merge; handle RenameRef refusal
Show description for 780e111
jimklimov
committed
780e111
View commit details
Copy full SHA for 780e111
Browse repository at this point
You can’t perform that action at this time.
