chore(main): release 1.4.0 (#156)

scolladon · web-flow · commit 5a05f6c01846 · 2026-01-23T08:11:51.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.0](https://github.com/scolladon/sf-git-merge-driver/compare/v1.3.0...v1.4.0) (2026-01-22)
+
+
+### Features
+
+* support manifest (`package.xml` like) merge ([#155](https://github.com/scolladon/sf-git-merge-driver/issues/155)) ([1b26b65](https://github.com/scolladon/sf-git-merge-driver/commit/1b26b6538bedb3d56d13f10f6271feca2f6b4044))
+
 ## [1.3.0](https://github.com/scolladon/sf-git-merge-driver/compare/v1.2.2...v1.3.0) (2025-12-31)
 
 
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 remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "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 remote add origin git@github.com:scolladon/sf-git-merge-driver.git",`
`4`		`- "version": "1.3.0",`
	`4`	`+ "version": "1.4.0",`
`5`	`5`	`"exports": "./lib/driver/MergeDriver.js",`
`6`	`6`	`"type": "module",`
`7`	`7`	`"author": "Sébastien Colladon (colladonsebastien@gmail.com)",`