allow to undo tags merge strategy

lumeland · Sep 27, 2024 · 9bea786 · 9bea786
1 parent 2d75fa2
commit 9bea786
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,10 @@ Go to the `v1` branch to see the changelog of Lume 1.
 ## [2.3.3] - Unreleased
 ### Added
 - Basic auth middleware: Added `errorMessage` option.
+- Added "none" merge strategy to reset a previously defined strategy.
+
 ### Fixed
-- When using special value `git created` for `date` variable, it will fall back to `git modified` first, then filesystem last modified date.
+- When using special value `git created` for `date` variable, it will fall back to `git modified` first, then filesystem last modified date #667.
 - Updated dependencies: `linkedom`, `sass`, `satori`, `terser`, `liquidjs`, `tailwind`, `date-fns`, `std`, `esbuild`, `preact`, `lightningcss`, `postcss`, `remark-rehype`, `react` types, `unocss`.
 
 ## [2.3.2] - 2024-09-10

diff --git a/core/utils/merge_data.ts b/core/utils/merge_data.ts
@@ -1,4 +1,4 @@
-export type MergeStrategy = "array" | "stringArray" | "object";
+export type MergeStrategy = "array" | "stringArray" | "object" | "none";
 
 interface DataToMerge {
   mergedKeys?: Record<string, MergeStrategy>;