Code

fix(project): config merging#1460

Code

Merged

ematipico merged 8 commits intobiomejs:mainbiomejs/biome:mainfrom arendjr:fix-config-mergingarendjr/biome:fix-config-mergingCopy head branch name to clipboardJan 12, 2024

+879-2,017

Commits

Commits on Jan 12, 2024

• Introduce NoneState and macroify MergeWith impls

  

  arendjr

  authored and

  ematipico

  committed
  913b4c8

  Copy full SHA for 913b4c8

• Improve merging of detauls

  

  arendjr

  authored and

  ematipico

  committed
  52c18d9

  Copy full SHA for 52c18d9

• Fix remaining test failures

  

  arendjr

  authored and

  ematipico

  committed
  56c1f62

  Copy full SHA for 56c1f62

• Don't create intermediary object before merging

  

  arendjr

  authored and

  ematipico

  committed
  0017378

  Copy full SHA for 0017378

• Mergeable => Merge

  

  arendjr

  authored and

  ematipico

  committed
  d3ca9bc

  Copy full SHA for d3ca9bc

• Add comment

  

  arendjr

  authored and

  ematipico

  committed
  8f5d499

  Copy full SHA for 8f5d499

• chore: changelog

  ematipico

  committed
  ceb7300

  Copy full SHA for ceb7300

• chore: fix merge conflicts

  ematipico

  committed
  71f76c7

  Copy full SHA for 71f76c7