Repository navigation
Conversation
MergeCommand now calls CycloneDXUtils.FlatMerge/HierarchicalMerge with MergeStrategy.Default() when built against a library that has it (#if NET8_0_OR_GREATER, matching the library's own guard -- CLI is net10.0-only today but this keeps the two projects' conditional compilation symmetric and self-documenting), falling back to the plain overload otherwise. No new CLI flags: strategy toggles are not yet exposed at the command-line layer, so this only changes default merge behavior, not the command's surface. Signed-off-by: Jim Klimov <jimklimov@gmail.com>
This was referenced Sep 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
MergeCommandnow callsCycloneDXUtils.FlatMerge/HierarchicalMergewithMergeStrategy.Default()when built against a library that has it (
#if NET8_0_OR_GREATER, matching the library's own guard —the CLI is net10.0-only today, but this keeps the two projects' conditional compilation symmetric and
self-documenting), falling back to the plain overload otherwise. No new CLI flags: strategy toggles
aren't exposed at the command-line layer here, so this only changes default merge behavior, not the
command's surface.
Why
Prerequisite plumbing for the rest of the
merge-related PRs in this batch (conflict-resolutionoption,
--input-files-list, metadata/cleanup,--validate-output,--attach-dangling-components,--strip-empty-lists) — none of them can be reviewed meaningfully without this landing first, sincethey all build on
MergeCommandactually calling the new library engine. No earlier PR proposed thisspecifically; it's foundational work that the (now-closed) old PRs implicitly assumed was already done.
Depends on cyclonedx-dotnet-library#446.
Independent of #509 (
rename-entity, no shared files) but a prerequisite for everything else in thisbatch.