sf-git-merge-driver 1.4.0-dev-159.21320251314-1 → 1.4.0-dev-159.21331490438-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/lib/merger/strategies/AbstractAncestorStrategy.d.ts +12 -0
- package/lib/merger/strategies/AbstractAncestorStrategy.js +39 -0
- package/lib/merger/strategies/AbstractAncestorStrategy.js.map +1 -0
- package/lib/merger/strategies/AncestorAndLocalStrategy.d.ts +7 -5
- package/lib/merger/strategies/AncestorAndLocalStrategy.js +10 -32
- package/lib/merger/strategies/AncestorAndLocalStrategy.js.map +1 -1
- package/lib/merger/strategies/AncestorAndOtherStrategy.d.ts +7 -5
- package/lib/merger/strategies/AncestorAndOtherStrategy.js +10 -32
- package/lib/merger/strategies/AncestorAndOtherStrategy.js.map +1 -1
- package/lib/merger/strategies/ScenarioStrategyFactory.js +16 -10
- package/lib/merger/strategies/ScenarioStrategyFactory.js.map +1 -1
- package/lib/merger/strategies/TextMergeStrategy.d.ts +2 -1
- package/npm-shrinkwrap.json +856 -135
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -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.4.0-dev-159.
|
|
4
|
+
"version": "1.4.0-dev-159.21331490438-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"simple-git": "^3.30.0"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"@biomejs/biome": "2.3.
|
|
22
|
+
"@biomejs/biome": "2.3.12",
|
|
23
23
|
"@commitlint/config-conventional": "^20.3.1",
|
|
24
24
|
"@oclif/plugin-help": "^6.2.37",
|
|
25
25
|
"@salesforce/cli-plugins-testkit": "^5.3.41",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"knip": "^5.82.1",
|
|
33
33
|
"mocha": "^11.7.5",
|
|
34
34
|
"nyc": "^17.1.0",
|
|
35
|
-
"oclif": "^4.22.
|
|
35
|
+
"oclif": "^4.22.69",
|
|
36
36
|
"shx": "^0.4.0",
|
|
37
37
|
"ts-jest": "^29.4.6",
|
|
38
38
|
"ts-node": "^10.9.2",
|