sf-git-merge-driver 1.2.1-dev-148.20575858150-1 → 1.2.1-dev-148.20575983510-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 +4 -4
- package/npm-shrinkwrap.json +2 -2
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -116,7 +116,7 @@ Configured for these metadata files by default:
|
|
|
116
116
|
When you don't want to use the merge driver for a specific merge, just backup the `.git/info/attributes` file and put it back after the merge.
|
|
117
117
|
```sh
|
|
118
118
|
mv .git/info/attributes .git/info/attributes.bak
|
|
119
|
-
git merge <
|
|
119
|
+
git merge <branch>
|
|
120
120
|
mv .git/info/attributes.bak .git/info/attributes
|
|
121
121
|
```
|
|
122
122
|
|
|
@@ -194,7 +194,7 @@ EXAMPLES
|
|
|
194
194
|
$ sf git merge driver install
|
|
195
195
|
```
|
|
196
196
|
|
|
197
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.
|
|
197
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575983510-1/src/commands/git/merge/driver/install.ts)_
|
|
198
198
|
|
|
199
199
|
## `sf git merge driver run`
|
|
200
200
|
|
|
@@ -238,7 +238,7 @@ EXAMPLES
|
|
|
238
238
|
- output-file is the path to the file where the merged content will be written
|
|
239
239
|
```
|
|
240
240
|
|
|
241
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.
|
|
241
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575983510-1/src/commands/git/merge/driver/run.ts)_
|
|
242
242
|
|
|
243
243
|
## `sf git merge driver uninstall`
|
|
244
244
|
|
|
@@ -265,7 +265,7 @@ EXAMPLES
|
|
|
265
265
|
$ sf git merge driver uninstall
|
|
266
266
|
```
|
|
267
267
|
|
|
268
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.
|
|
268
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575983510-1/src/commands/git/merge/driver/uninstall.ts)_
|
|
269
269
|
<!-- commandsstop -->
|
|
270
270
|
## Changelog
|
|
271
271
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.2.1-dev-148.
|
|
3
|
+
"version": "1.2.1-dev-148.20575983510-1",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "sf-git-merge-driver",
|
|
9
|
-
"version": "1.2.1-dev-148.
|
|
9
|
+
"version": "1.2.1-dev-148.20575983510-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 remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
|
|
4
|
-
"version": "1.2.1-dev-148.
|
|
4
|
+
"version": "1.2.1-dev-148.20575983510-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|