Merge strategy refinements: scope-conflict resolution, RenameRef refusal, Squash_RenameByScope (2/5) - #447

Open

jimklimov wants to merge 13 commits into

CycloneDX:mainfrom

jimklimov:merge-strategy-refinements

Commits on Sep 15, 2026

Introduce IBomEntity/IMergeable<T>/IEquivalent<T> interfaces and MergeStrategy
jimklimov
committed
f01e735

Commits on Sep 17, 2026

Retarget mergeable model classes to IMergeable<T>/IEquivalent<T>

jimklimov
and
claude
committed
c2b4dac
Add strategy-aware MergeableListHelper.Merge<T>
jimklimov
committed
4c6624c
Component: real Equivalent/MergeWith, field-by-field, no reflection
jimklimov
committed
5e566bb
Add BomRefWalker and Bom.RenameRef/BomMetadataUpdate/ReferThisToolkit
jimklimov
committed
0ad6727
Add strategy-aware FlatMerge/HierarchicalMerge overloads
jimklimov
committed
e3074cc
Add focused tests for the new merge-strategy capability
jimklimov
committed
a76cde2
Add strategy-aware multi-BOM FlatMerge(IEnumerable<Bom>, ...) overloads
jimklimov
committed
139c3b0
Flip default scope-conflict resolution to Squash_UpgradeScope; rename enum
jimklimov
committed
578100f
Bom.RenameRef: refuse rather than silently collide
jimklimov
committed
3331ec7
Dependency: real Equivalent/MergeWith for subset-dependency merging
jimklimov
committed
356abf7
Implement Squash_RenameByScope: split scope-conflicting components by bom-ref
jimklimov
committed
f7c0583
Merge.cs: fix stale comment on Dependency reconciliation

jimklimov
and
claude
committed
30fd0b6