Code

feat: add merging functionality#12

Code

Draft

nscuro wants to merge 6 commits intomasterCycloneDX/cyclonedx-go:masterfrom 9-mergingCycloneDX/cyclonedx-go:9-mergingCopy head branch name to clipboard

+1,818-18

Commits

Commits on Feb 25, 2022

• incorporate bom link; add test files for components merge

  Show description for a2657d9
  nscuro

  committed
  a2657d9

  Copy full SHA for a2657d9

• gotta love them license headers

  Show description for 8c5a696
  nscuro

  committed
  8c5a696

  Copy full SHA for 8c5a696

Commits on Feb 26, 2022

• add hierarchical merge again; add properties tests

  Show description for 9228dea
  nscuro

  committed
  9228dea

  Copy full SHA for 9228dea

• more link tests

  Show description for 865f0a9
  nscuro

  committed
  865f0a9

  Copy full SHA for 865f0a9

Commits on Mar 1, 2022

• Merge branch 'master' into 9-merging

  nscuro

  committed
  8cfab85

  Copy full SHA for 8cfab85

Commits on Apr 14, 2022

• Merge branch 'master' into 9-merging

  nscuro

  committed
  8a99532

  Copy full SHA for 8a99532