sf-git-merge-driver 1.0.0-dev-3.14242356173-1 → 1.0.0-dev-3.14244475954-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 +11 -11
- package/lib/commands/git/merge/driver/run.d.ts +3 -3
- package/lib/commands/git/merge/driver/run.js +13 -13
- package/lib/commands/git/merge/driver/run.js.map +1 -1
- package/lib/constant/conflictConstant.d.ts +6 -3
- package/lib/constant/conflictConstant.js +6 -3
- package/lib/constant/conflictConstant.js.map +1 -1
- package/lib/merger/conflictMarker.js +7 -10
- package/lib/merger/conflictMarker.js.map +1 -1
- package/lib/types/conflictTypes.d.ts +3 -3
- package/messages/run.md +6 -6
- package/npm-shrinkwrap.json +2 -2
- package/oclif.manifest.json +13 -13
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -47,7 +47,7 @@ EXAMPLES
|
|
|
47
47
|
$ sf git merge driver install
|
|
48
48
|
```
|
|
49
49
|
|
|
50
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
50
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14244475954-1/src/commands/git/merge/driver/install.ts)_
|
|
51
51
|
|
|
52
52
|
## `sf git merge driver run`
|
|
53
53
|
|
|
@@ -59,14 +59,14 @@ USAGE
|
|
|
59
59
|
<value>] [-X <value>] [-Y <value>]
|
|
60
60
|
|
|
61
61
|
FLAGS
|
|
62
|
-
-A, --local-file=<value>
|
|
63
|
-
-B, --other-file=<value>
|
|
64
|
-
-L, --conflict-marker-size=<value>
|
|
65
|
-
-O, --ancestor-file=<value>
|
|
66
|
-
-P, --output-file=<value>
|
|
67
|
-
-S, --ancestor-conflict-
|
|
68
|
-
-X, --local-conflict-
|
|
69
|
-
-Y, --other-conflict-
|
|
62
|
+
-A, --local-file=<value> (required) path to our version of the file
|
|
63
|
+
-B, --other-file=<value> (required) path to their version of the file
|
|
64
|
+
-L, --conflict-marker-size=<value> [default: 7] number of characters to show for conflict markers
|
|
65
|
+
-O, --ancestor-file=<value> (required) path to the common ancestor version of the file
|
|
66
|
+
-P, --output-file=<value> (required) path to the file where the merged content will be written
|
|
67
|
+
-S, --ancestor-conflict-tag=<value> [default: BASE] string used to tag ancestor version in conflicts
|
|
68
|
+
-X, --local-conflict-tag=<value> [default: LOCAL] string used to tag local version in conflicts
|
|
69
|
+
-Y, --other-conflict-tag=<value> [default: REMOTE] string used to tag other version in conflicts
|
|
70
70
|
|
|
71
71
|
GLOBAL FLAGS
|
|
72
72
|
--flags-dir=<value> Import flag values from a directory.
|
|
@@ -91,7 +91,7 @@ EXAMPLES
|
|
|
91
91
|
- output-file is the path to the file where the merged content will be written
|
|
92
92
|
```
|
|
93
93
|
|
|
94
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
94
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14244475954-1/src/commands/git/merge/driver/run.ts)_
|
|
95
95
|
|
|
96
96
|
## `sf git merge driver uninstall`
|
|
97
97
|
|
|
@@ -118,7 +118,7 @@ EXAMPLES
|
|
|
118
118
|
$ sf git merge driver uninstall
|
|
119
119
|
```
|
|
120
120
|
|
|
121
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
121
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14244475954-1/src/commands/git/merge/driver/uninstall.ts)_
|
|
122
122
|
<!-- commandsstop -->
|
|
123
123
|
|
|
124
124
|
## How It Works
|
|
@@ -9,9 +9,9 @@ export default class Run extends SfCommand<void> {
|
|
|
9
9
|
'other-file': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
10
10
|
'output-file': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
11
11
|
'conflict-marker-size': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
|
-
'ancestor-conflict-
|
|
13
|
-
'local-conflict-
|
|
14
|
-
'other-conflict-
|
|
12
|
+
'ancestor-conflict-tag': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
13
|
+
'local-conflict-tag': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
|
+
'other-conflict-tag': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
15
15
|
};
|
|
16
16
|
run(): Promise<void>;
|
|
17
17
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Messages } from '@salesforce/core';
|
|
2
2
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
|
-
import {
|
|
3
|
+
import { DEFAULT_ANCESTOR_CONFLICT_TAG, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_LOCAL_CONFLICT_TAG, DEFAULT_OTHER_CONFLICT_TAG, } from '../../../../constant/conflictConstant.js';
|
|
4
4
|
import { MergeDriver } from '../../../../driver/MergeDriver.js';
|
|
5
5
|
import { ConflictMarker } from '../../../../merger/conflictMarker.js';
|
|
6
6
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
@@ -40,29 +40,29 @@ export default class Run extends SfCommand {
|
|
|
40
40
|
min: 1,
|
|
41
41
|
default: DEFAULT_CONFLICT_MARKER_SIZE,
|
|
42
42
|
}),
|
|
43
|
-
'ancestor-conflict-
|
|
43
|
+
'ancestor-conflict-tag': Flags.string({
|
|
44
44
|
char: 'S',
|
|
45
|
-
summary: messages.getMessage('flags.ancestor-conflict-
|
|
46
|
-
default:
|
|
45
|
+
summary: messages.getMessage('flags.ancestor-conflict-tag.summary'),
|
|
46
|
+
default: DEFAULT_ANCESTOR_CONFLICT_TAG,
|
|
47
47
|
}),
|
|
48
|
-
'local-conflict-
|
|
48
|
+
'local-conflict-tag': Flags.string({
|
|
49
49
|
char: 'X',
|
|
50
|
-
summary: messages.getMessage('flags.local-conflict-
|
|
51
|
-
default:
|
|
50
|
+
summary: messages.getMessage('flags.local-conflict-tag.summary'),
|
|
51
|
+
default: DEFAULT_LOCAL_CONFLICT_TAG,
|
|
52
52
|
}),
|
|
53
|
-
'other-conflict-
|
|
53
|
+
'other-conflict-tag': Flags.string({
|
|
54
54
|
char: 'Y',
|
|
55
|
-
summary: messages.getMessage('flags.other-conflict-
|
|
56
|
-
default:
|
|
55
|
+
summary: messages.getMessage('flags.other-conflict-tag.summary'),
|
|
56
|
+
default: DEFAULT_OTHER_CONFLICT_TAG,
|
|
57
57
|
}),
|
|
58
58
|
};
|
|
59
59
|
async run() {
|
|
60
60
|
const { flags } = await this.parse(Run);
|
|
61
61
|
const conflicConfig = {
|
|
62
62
|
conflictMarkerSize: flags['conflict-marker-size'],
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
ancestorConflictTag: flags['ancestor-conflict-tag'],
|
|
64
|
+
localConflictTag: flags['local-conflict-tag'],
|
|
65
|
+
otherConflictTag: flags['other-conflict-tag'],
|
|
66
66
|
};
|
|
67
67
|
ConflictMarker.setConflictConfig(conflicConfig);
|
|
68
68
|
const mergeDriver = new MergeDriver();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EACL,6BAA6B,EAC7B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAGrE,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;AAEpE,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,SAAe;IACvC,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG;QACtC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;YAC3D,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YACxD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YACxD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC;YACpC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oCAAoC,CAAC;YAClE,GAAG,EAAE,CAAC;YACN,OAAO,EAAE,4BAA4B;SACtC,CAAC;QACF,uBAAuB,EAAE,KAAK,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qCAAqC,CAAC;YACnE,OAAO,EAAE,6BAA6B;SACvC,CAAC;QACF,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC;YACjC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC;YAChE,OAAO,EAAE,0BAA0B;SACpC,CAAC;QACF,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC;YACjC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC;YAChE,OAAO,EAAE,0BAA0B;SACpC,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,aAAa,GAAkB;YACnC,kBAAkB,EAAE,KAAK,CAAC,sBAAsB,CAAC;YACjD,mBAAmB,EAAE,KAAK,CAAC,uBAAuB,CAAC;YACnD,gBAAgB,EAAE,KAAK,CAAC,oBAAoB,CAAC;YAC7C,gBAAgB,EAAE,KAAK,CAAC,oBAAoB,CAAC;SAC9C,CAAA;QACD,cAAc,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;QAE/C,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;QACrC,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,CAC9C,KAAK,CAAC,eAAe,CAAC,EACtB,KAAK,CAAC,YAAY,CAAC,EACnB,KAAK,CAAC,YAAY,CAAC,EACnB,KAAK,CAAC,aAAa,CAAC,CACrB,CAAA;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CACR,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC,EACvE,EAAE,IAAI,EAAE,CAAC,EAAE,CACZ,CAAA;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CACP,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC,CACtE,CAAA;QACH,CAAC;IACH,CAAC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
export declare const DEFAULT_CONFLICT_MARKER_SIZE = 7;
|
|
2
|
-
export declare const
|
|
3
|
-
export declare const
|
|
4
|
-
export declare const
|
|
2
|
+
export declare const ANCESTOR_CONFLICT_MARKER = "|";
|
|
3
|
+
export declare const LOCAL_CONFLICT_MARKER = "<";
|
|
4
|
+
export declare const OTHER_CONFLICT_MARKER = ">";
|
|
5
|
+
export declare const DEFAULT_ANCESTOR_CONFLICT_TAG = "BASE";
|
|
6
|
+
export declare const DEFAULT_LOCAL_CONFLICT_TAG = "LOCAL";
|
|
7
|
+
export declare const DEFAULT_OTHER_CONFLICT_TAG = "REMOTE";
|
|
5
8
|
export declare const SEPARATOR = "=";
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
export const DEFAULT_CONFLICT_MARKER_SIZE = 7;
|
|
2
|
-
export const
|
|
3
|
-
export const
|
|
4
|
-
export const
|
|
2
|
+
export const ANCESTOR_CONFLICT_MARKER = '|';
|
|
3
|
+
export const LOCAL_CONFLICT_MARKER = '<';
|
|
4
|
+
export const OTHER_CONFLICT_MARKER = '>';
|
|
5
|
+
export const DEFAULT_ANCESTOR_CONFLICT_TAG = 'BASE';
|
|
6
|
+
export const DEFAULT_LOCAL_CONFLICT_TAG = 'LOCAL';
|
|
7
|
+
export const DEFAULT_OTHER_CONFLICT_TAG = 'REMOTE';
|
|
5
8
|
export const SEPARATOR = '=';
|
|
6
9
|
//# sourceMappingURL=conflictConstant.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictConstant.js","sourceRoot":"","sources":["../../src/constant/conflictConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAA;AAC7C,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"conflictConstant.js","sourceRoot":"","sources":["../../src/constant/conflictConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAA;AAC7C,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,CAAA;AAC3C,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAA;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAA;AACxC,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAA;AACnD,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAA;AACjD,MAAM,CAAC,MAAM,0BAA0B,GAAG,QAAQ,CAAA;AAClD,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAA"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { EOL } from 'node:os';
|
|
2
2
|
import { isEmpty } from 'lodash-es';
|
|
3
|
-
import {
|
|
3
|
+
import { ANCESTOR_CONFLICT_MARKER, DEFAULT_ANCESTOR_CONFLICT_TAG, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_LOCAL_CONFLICT_TAG, DEFAULT_OTHER_CONFLICT_TAG, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
|
|
4
4
|
import { TEXT_TAG } from '../constant/parserConstant.js';
|
|
5
|
-
const BASE = 'BASE';
|
|
6
|
-
const LOCAL = 'LOCAL';
|
|
7
|
-
const REMOTE = 'REMOTE';
|
|
8
5
|
const buildMarker = (marker, size, tag) => {
|
|
9
6
|
return `${marker.repeat(size)} ${tag}`;
|
|
10
7
|
};
|
|
@@ -13,9 +10,9 @@ const buildSeparator = (size) => {
|
|
|
13
10
|
};
|
|
14
11
|
export class ConflictMarker {
|
|
15
12
|
static hasConflict = false;
|
|
16
|
-
static baseMarker = buildMarker(
|
|
17
|
-
static localMarker = buildMarker(
|
|
18
|
-
static otherMarker = buildMarker(
|
|
13
|
+
static baseMarker = buildMarker(ANCESTOR_CONFLICT_MARKER, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_ANCESTOR_CONFLICT_TAG);
|
|
14
|
+
static localMarker = buildMarker(LOCAL_CONFLICT_MARKER, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_LOCAL_CONFLICT_TAG);
|
|
15
|
+
static otherMarker = buildMarker(OTHER_CONFLICT_MARKER, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_OTHER_CONFLICT_TAG);
|
|
19
16
|
static separatorMarker = buildSeparator(DEFAULT_CONFLICT_MARKER_SIZE);
|
|
20
17
|
static hasConflictMarker() {
|
|
21
18
|
return ConflictMarker.hasConflict;
|
|
@@ -31,9 +28,9 @@ export class ConflictMarker {
|
|
|
31
28
|
acc.push({ [TEXT_TAG]: ConflictMarker.otherMarker });
|
|
32
29
|
}
|
|
33
30
|
static setConflictConfig(conflictConfig) {
|
|
34
|
-
ConflictMarker.baseMarker = buildMarker(
|
|
35
|
-
ConflictMarker.localMarker = buildMarker(
|
|
36
|
-
ConflictMarker.otherMarker = buildMarker(
|
|
31
|
+
ConflictMarker.baseMarker = buildMarker(ANCESTOR_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.ancestorConflictTag);
|
|
32
|
+
ConflictMarker.localMarker = buildMarker(LOCAL_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.localConflictTag);
|
|
33
|
+
ConflictMarker.otherMarker = buildMarker(OTHER_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.otherConflictTag);
|
|
37
34
|
ConflictMarker.separatorMarker = buildSeparator(conflictConfig.conflictMarkerSize);
|
|
38
35
|
}
|
|
39
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"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"}
|
package/messages/run.md
CHANGED
|
@@ -37,14 +37,14 @@ path to the file where the merged content will be written
|
|
|
37
37
|
# flags.conflict-marker-size.summary
|
|
38
38
|
number of characters to show for conflict markers
|
|
39
39
|
|
|
40
|
-
# flags.ancestor-conflict-
|
|
41
|
-
|
|
40
|
+
# flags.ancestor-conflict-tag.summary
|
|
41
|
+
string used to tag ancestor version in conflicts
|
|
42
42
|
|
|
43
|
-
# flags.local-conflict-
|
|
44
|
-
|
|
43
|
+
# flags.local-conflict-tag.summary
|
|
44
|
+
string used to tag local version in conflicts
|
|
45
45
|
|
|
46
|
-
# flags.other-conflict-
|
|
47
|
-
|
|
46
|
+
# flags.other-conflict-tag.summary
|
|
47
|
+
string used to tag other version in conflicts
|
|
48
48
|
|
|
49
49
|
# result.withconflict
|
|
50
50
|
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.0.0-dev-3.
|
|
3
|
+
"version": "1.0.0-dev-3.14244475954-1",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "sf-git-merge-driver",
|
|
9
|
-
"version": "1.0.0-dev-3.
|
|
9
|
+
"version": "1.0.0-dev-3.14244475954-1",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.2.10",
|
package/oclif.manifest.json
CHANGED
|
@@ -139,29 +139,29 @@
|
|
|
139
139
|
"multiple": false,
|
|
140
140
|
"type": "option"
|
|
141
141
|
},
|
|
142
|
-
"ancestor-conflict-
|
|
142
|
+
"ancestor-conflict-tag": {
|
|
143
143
|
"char": "S",
|
|
144
|
-
"name": "ancestor-conflict-
|
|
145
|
-
"summary": "
|
|
146
|
-
"default": "
|
|
144
|
+
"name": "ancestor-conflict-tag",
|
|
145
|
+
"summary": "string used to tag ancestor version in conflicts",
|
|
146
|
+
"default": "BASE",
|
|
147
147
|
"hasDynamicHelp": false,
|
|
148
148
|
"multiple": false,
|
|
149
149
|
"type": "option"
|
|
150
150
|
},
|
|
151
|
-
"local-conflict-
|
|
151
|
+
"local-conflict-tag": {
|
|
152
152
|
"char": "X",
|
|
153
|
-
"name": "local-conflict-
|
|
154
|
-
"summary": "
|
|
155
|
-
"default": "
|
|
153
|
+
"name": "local-conflict-tag",
|
|
154
|
+
"summary": "string used to tag local version in conflicts",
|
|
155
|
+
"default": "LOCAL",
|
|
156
156
|
"hasDynamicHelp": false,
|
|
157
157
|
"multiple": false,
|
|
158
158
|
"type": "option"
|
|
159
159
|
},
|
|
160
|
-
"other-conflict-
|
|
160
|
+
"other-conflict-tag": {
|
|
161
161
|
"char": "Y",
|
|
162
|
-
"name": "other-conflict-
|
|
163
|
-
"summary": "
|
|
164
|
-
"default": "
|
|
162
|
+
"name": "other-conflict-tag",
|
|
163
|
+
"summary": "string used to tag other version in conflicts",
|
|
164
|
+
"default": "REMOTE",
|
|
165
165
|
"hasDynamicHelp": false,
|
|
166
166
|
"multiple": false,
|
|
167
167
|
"type": "option"
|
|
@@ -284,5 +284,5 @@
|
|
|
284
284
|
]
|
|
285
285
|
}
|
|
286
286
|
},
|
|
287
|
-
"version": "1.0.0-dev-3.
|
|
287
|
+
"version": "1.0.0-dev-3.14244475954-1"
|
|
288
288
|
}
|
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.0.0-dev-3.
|
|
4
|
+
"version": "1.0.0-dev-3.14244475954-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|