chore(main): release 1.5.4 (#176)

scolladon · web-flow · commit 27bed2503498 · 2026-02-26T11:05:01.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.5.4](https://github.com/scolladon/sf-git-merge-driver/compare/v1.5.3...v1.5.4) (2026-02-26)
+
+
+### Bug Fixes
+
+* picklist values corrupted in Deterministic Ordered merge ([#175](https://github.com/scolladon/sf-git-merge-driver/issues/175)) ([365c7f7](https://github.com/scolladon/sf-git-merge-driver/commit/365c7f7dd0c6a6ee600374e1cb4fb8fafc561316))
+
 ## [1.5.3](https://github.com/scolladon/sf-git-merge-driver/compare/v1.5.2...v1.5.3) (2026-02-17)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
   "description": "Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sf-git-merge-driver",`
`3`	`3`	`"description": "Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",`
`4`		`- "version": "1.5.3",`
	`4`	`+ "version": "1.5.4",`
`5`	`5`	`"exports": "./lib/driver/MergeDriver.js",`
`6`	`6`	`"type": "module",`
`7`	`7`	`"author": "Sébastien Colladon (colladonsebastien@gmail.com)",`