Skip to content

Commit 0ca8e99

Browse files
authored
chore(main): release 1.5.1 (#169)
1 parent a9fe834 commit 0ca8e99

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [1.5.1](https://github.com/scolladon/sf-git-merge-driver/compare/v1.5.0...v1.5.1) (2026-02-16)
4+
5+
6+
### Bug Fixes
7+
8+
* improve deterministic ordering and remove dead code ([#168](https://github.com/scolladon/sf-git-merge-driver/issues/168)) ([a9fe834](https://github.com/scolladon/sf-git-merge-driver/commit/a9fe8346d2478dabd49b0ee827429afc1978817f))
9+
310
## [1.5.0](https://github.com/scolladon/sf-git-merge-driver/compare/v1.4.1...v1.5.0) (2026-02-09)
411

512

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sf-git-merge-driver",
33
"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.0",
4+
"version": "1.5.1",
55
"exports": "./lib/driver/MergeDriver.js",
66
"type": "module",
77
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",

0 commit comments

Comments
 (0)