sf-git-merge-driver 1.4.0-dev-159.21331490438-1 → 1.4.0-dev-159.21331607083-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/npm-shrinkwrap.json +2 -2
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -279,7 +279,7 @@ EXAMPLES
|
|
|
279
279
|
$ sf git merge driver install
|
|
280
280
|
```
|
|
281
281
|
|
|
282
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.4.0-dev-159.
|
|
282
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.4.0-dev-159.21331607083-1/src/commands/git/merge/driver/install.ts)_
|
|
283
283
|
|
|
284
284
|
## `sf git merge driver run`
|
|
285
285
|
|
|
@@ -323,7 +323,7 @@ EXAMPLES
|
|
|
323
323
|
- output-file is the path to the file where the merged content will be written
|
|
324
324
|
```
|
|
325
325
|
|
|
326
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.4.0-dev-159.
|
|
326
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.4.0-dev-159.21331607083-1/src/commands/git/merge/driver/run.ts)_
|
|
327
327
|
|
|
328
328
|
## `sf git merge driver uninstall`
|
|
329
329
|
|
|
@@ -353,7 +353,7 @@ EXAMPLES
|
|
|
353
353
|
$ sf git merge driver uninstall
|
|
354
354
|
```
|
|
355
355
|
|
|
356
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.4.0-dev-159.
|
|
356
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.4.0-dev-159.21331607083-1/src/commands/git/merge/driver/uninstall.ts)_
|
|
357
357
|
<!-- commandsstop -->
|
|
358
358
|
## Changelog
|
|
359
359
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.4.0-dev-159.
|
|
3
|
+
"version": "1.4.0-dev-159.21331607083-1",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "sf-git-merge-driver",
|
|
9
|
-
"version": "1.4.0-dev-159.
|
|
9
|
+
"version": "1.4.0-dev-159.21331607083-1",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.8.0",
|
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.21331607083-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|