sf-git-merge-driver 1.0.0-dev-3.14036785785-1 → 1.0.0-dev-3.14037427096-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/JsonMerger.js +30 -24
- package/lib/merger/JsonMerger.js.map +1 -1
- package/npm-shrinkwrap.json +2 -2
- package/oclif.manifest.json +1 -1
- 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.14037427096-1/src/commands/git/merge/driver/install.ts)_
|
|
51
51
|
|
|
52
52
|
## `sf git merge driver run`
|
|
53
53
|
|
|
@@ -85,7 +85,7 @@ EXAMPLES
|
|
|
85
85
|
- output-file is the path to the file where the merged content will be written
|
|
86
86
|
```
|
|
87
87
|
|
|
88
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
88
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14037427096-1/src/commands/git/merge/driver/run.ts)_
|
|
89
89
|
|
|
90
90
|
## `sf git merge driver uninstall`
|
|
91
91
|
|
|
@@ -112,7 +112,7 @@ EXAMPLES
|
|
|
112
112
|
$ sf git merge driver uninstall
|
|
113
113
|
```
|
|
114
114
|
|
|
115
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
115
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14037427096-1/src/commands/git/merge/driver/uninstall.ts)_
|
|
116
116
|
<!-- commandsstop -->
|
|
117
117
|
|
|
118
118
|
## How It Works
|
package/lib/merger/JsonMerger.js
CHANGED
|
@@ -44,16 +44,19 @@ const mergeMetadata = (ancestor, ours, theirs) => {
|
|
|
44
44
|
const props = getUniqueSortedProps(ancestor, ours, theirs);
|
|
45
45
|
for (const key of props) {
|
|
46
46
|
let values = [];
|
|
47
|
-
|
|
47
|
+
const ancestorOfKey = ancestor[key];
|
|
48
|
+
const oursOfKey = ours[key];
|
|
49
|
+
const theirsOfKey = theirs[key];
|
|
50
|
+
if (isObject(ancestorOfKey, oursOfKey, theirsOfKey)) {
|
|
48
51
|
const [ancestorkey, ourkey, theirkey] = [
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
+
ancestorOfKey,
|
|
53
|
+
oursOfKey,
|
|
54
|
+
theirsOfKey,
|
|
52
55
|
].map(ensureArray);
|
|
53
56
|
values = mergeArrays(ancestorkey, ourkey, theirkey, key);
|
|
54
57
|
}
|
|
55
58
|
else {
|
|
56
|
-
values = mergeTextAttribute(
|
|
59
|
+
values = mergeTextAttribute(ancestorOfKey, oursOfKey, theirsOfKey, key);
|
|
57
60
|
}
|
|
58
61
|
acc.push(values);
|
|
59
62
|
}
|
|
@@ -114,59 +117,62 @@ const mergeByKeyField = (ancestor, ours, theirs, attribute) => {
|
|
|
114
117
|
const acc = [];
|
|
115
118
|
const props = getUniqueSortedProps(ancestor, ours, theirs);
|
|
116
119
|
for (const key of props) {
|
|
117
|
-
const
|
|
120
|
+
const ancestorOfKey = ancestor[key];
|
|
121
|
+
const oursOfKey = ours[key];
|
|
122
|
+
const theirsOfKey = theirs[key];
|
|
123
|
+
const scenario = getScenario(ancestorOfKey, oursOfKey, theirsOfKey);
|
|
118
124
|
const obj = {};
|
|
119
125
|
switch (scenario) {
|
|
120
126
|
case MergeScenario.THEIRS_ONLY:
|
|
121
|
-
obj[attribute] = mergeMetadata({}, {},
|
|
127
|
+
obj[attribute] = mergeMetadata({}, {}, theirsOfKey);
|
|
122
128
|
break;
|
|
123
129
|
case MergeScenario.OURS_ONLY:
|
|
124
|
-
obj[attribute] = mergeMetadata({},
|
|
130
|
+
obj[attribute] = mergeMetadata({}, oursOfKey, {});
|
|
125
131
|
break;
|
|
126
132
|
case MergeScenario.ANCESTOR_ONLY:
|
|
127
133
|
break;
|
|
128
134
|
case MergeScenario.OURS_AND_THEIRS:
|
|
129
|
-
if (isEqual(
|
|
130
|
-
obj[attribute] = mergeMetadata({}, {},
|
|
135
|
+
if (isEqual(oursOfKey, theirsOfKey)) {
|
|
136
|
+
obj[attribute] = mergeMetadata({}, {}, theirsOfKey);
|
|
131
137
|
}
|
|
132
138
|
else {
|
|
133
|
-
obj[attribute] = mergeMetadata({},
|
|
139
|
+
obj[attribute] = mergeMetadata({}, oursOfKey, theirsOfKey);
|
|
134
140
|
}
|
|
135
141
|
break;
|
|
136
142
|
case MergeScenario.ANCESTOR_AND_THEIRS:
|
|
137
|
-
if (!isEqual(
|
|
143
|
+
if (!isEqual(ancestorOfKey, theirsOfKey)) {
|
|
138
144
|
const ancestorProp = {
|
|
139
|
-
[attribute]: mergeMetadata({},
|
|
145
|
+
[attribute]: mergeMetadata({}, ancestorOfKey, {}),
|
|
140
146
|
};
|
|
141
147
|
const theirsProp = {
|
|
142
|
-
[attribute]: mergeMetadata({}, {},
|
|
148
|
+
[attribute]: mergeMetadata({}, {}, theirsOfKey),
|
|
143
149
|
};
|
|
144
150
|
addConflictMarkers(acc, {}, ancestorProp, theirsProp);
|
|
145
151
|
}
|
|
146
152
|
break;
|
|
147
153
|
case MergeScenario.ANCESTOR_AND_OURS:
|
|
148
|
-
if (!isEqual(
|
|
154
|
+
if (!isEqual(ancestorOfKey, oursOfKey)) {
|
|
149
155
|
const oursProp = {
|
|
150
|
-
[attribute]: mergeMetadata({},
|
|
156
|
+
[attribute]: mergeMetadata({}, oursOfKey, {}),
|
|
151
157
|
};
|
|
152
158
|
const ancestorProp = {
|
|
153
|
-
[attribute]: mergeMetadata({},
|
|
159
|
+
[attribute]: mergeMetadata({}, ancestorOfKey, {}),
|
|
154
160
|
};
|
|
155
161
|
addConflictMarkers(acc, oursProp, ancestorProp, {});
|
|
156
162
|
}
|
|
157
163
|
break;
|
|
158
164
|
case MergeScenario.ALL:
|
|
159
|
-
if (isEqual(
|
|
160
|
-
obj[attribute] = mergeMetadata({}, {},
|
|
165
|
+
if (isEqual(oursOfKey, theirsOfKey)) {
|
|
166
|
+
obj[attribute] = mergeMetadata({}, {}, theirsOfKey);
|
|
161
167
|
}
|
|
162
|
-
else if (isEqual(
|
|
163
|
-
obj[attribute] = mergeMetadata({}, {},
|
|
168
|
+
else if (isEqual(ancestorOfKey, oursOfKey)) {
|
|
169
|
+
obj[attribute] = mergeMetadata({}, {}, theirsOfKey);
|
|
164
170
|
}
|
|
165
|
-
else if (isEqual(
|
|
166
|
-
obj[attribute] = mergeMetadata({},
|
|
171
|
+
else if (isEqual(ancestorOfKey, theirsOfKey)) {
|
|
172
|
+
obj[attribute] = mergeMetadata({}, oursOfKey, {});
|
|
167
173
|
}
|
|
168
174
|
else {
|
|
169
|
-
obj[attribute] = mergeMetadata(
|
|
175
|
+
obj[attribute] = mergeMetadata(ancestorOfKey, oursOfKey, theirsOfKey);
|
|
170
176
|
}
|
|
171
177
|
break;
|
|
172
178
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,QAAQ,GACT,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEvD,MAAM,OAAO,UAAU;IACd,KAAK,CACV,QAAgC,EAChC,IAA4B,EAC5B,MAA8B;QAE9B,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC/C,MAAM,UAAU,GAAG,gBAAgB,CAAC,iBAAiB,CACnD,QAAQ,EACR,IAAI,EACJ,MAAM,CACP,CAAA;QACD,MAAM,QAAQ,GAAkB,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QACnE,MAAM,GAAG,GAAgB,EAAE,CAAA;QAC3B,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAC1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,aAAa,CAAC,aAAa;oBAC9B,MAAK;gBACP,KAAK,aAAa,CAAC,eAAe;oBAChC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;oBAChD,MAAK;gBACP,KAAK,aAAa,CAAC,mBAAmB;oBACpC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;oBACxD,MAAK;gBACP,KAAK,aAAa,CAAC,iBAAiB;oBAClC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;oBACpD,MAAK;gBACP,OAAO,CAAC,CAAC,CAAC;oBACR,MAAM,GAAG,GAAG;wBACV,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;qBAC5D,CAAA;oBACD,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;oBACf,MAAK;gBACP,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAA;QACzB,gBAAgB,CAAC,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAC1D,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AACD,MAAM,aAAa,GAAG,CACpB,QAAgC,EAChC,IAA4B,EAC5B,MAA8B,EACnB,EAAE;IACb,MAAM,GAAG,GAAgB,EAAE,CAAA;IAC3B,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,GAAc,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,QAAQ,GACT,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEvD,MAAM,OAAO,UAAU;IACd,KAAK,CACV,QAAgC,EAChC,IAA4B,EAC5B,MAA8B;QAE9B,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC/C,MAAM,UAAU,GAAG,gBAAgB,CAAC,iBAAiB,CACnD,QAAQ,EACR,IAAI,EACJ,MAAM,CACP,CAAA;QACD,MAAM,QAAQ,GAAkB,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QACnE,MAAM,GAAG,GAAgB,EAAE,CAAA;QAC3B,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAC1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,aAAa,CAAC,aAAa;oBAC9B,MAAK;gBACP,KAAK,aAAa,CAAC,eAAe;oBAChC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;oBAChD,MAAK;gBACP,KAAK,aAAa,CAAC,mBAAmB;oBACpC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;oBACxD,MAAK;gBACP,KAAK,aAAa,CAAC,iBAAiB;oBAClC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;oBACpD,MAAK;gBACP,OAAO,CAAC,CAAC,CAAC;oBACR,MAAM,GAAG,GAAG;wBACV,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;qBAC5D,CAAA;oBACD,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;oBACf,MAAK;gBACP,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAA;QACzB,gBAAgB,CAAC,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAC1D,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AACD,MAAM,aAAa,GAAG,CACpB,QAAgC,EAChC,IAA4B,EAC5B,MAA8B,EACnB,EAAE;IACb,MAAM,GAAG,GAAgB,EAAE,CAAA;IAC3B,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,GAAc,EAAE,CAAA;QAC1B,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QAE/B,IAAI,QAAQ,CAAC,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC;YACpD,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG;gBACtC,aAAa;gBACb,SAAS;gBACT,WAAW;aACZ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YAClB,MAAM,GAAG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;QAC1D,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,kBAAkB,CAAC,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,CAAC,CAAA;QACzE,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAClB,CAAC;IAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAC1B,GAAW,EACX,IAA4B,EAC5B,MAA8B,EACnB,EAAE;IACb,MAAM,GAAG,GAAe,EAAE,CAAA;IAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IAC3C,MAAM,GAAG,GAAc,EAAE,CAAA;IACzB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG;YACjB,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;SAC1C,CAAA;QACD,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,UAAU,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACf,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAC9B,GAAW,EACX,QAAgC,EAChC,MAA8B,EACnB,EAAE;IACb,MAAM,GAAG,GAAc,EAAE,CAAA;IACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG;YACnB,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC5C,CAAA;QACD,MAAM,UAAU,GAAG;YACjB,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;SAC1C,CAAA;QACD,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;IACvD,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAC5B,GAAW,EACX,QAAgC,EAChC,IAA4B,EACjB,EAAE;IACb,MAAM,GAAG,GAAc,EAAE,CAAA;IACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG;YACf,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC,CAAA;QACD,MAAM,YAAY,GAAG;YACnB,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC5C,CAAA;QACD,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,CAAC,CAAA;IACrD,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAClB,QAAmB,EACnB,IAAe,EACf,MAAiB,EACjB,SAAiB,EACN,EAAE;IACb,MAAM,QAAQ,GAAG,eAAe,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;IAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,EAAE,CAAA;QACd,GAAG,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QACjD,OAAO,CAAC,GAAG,CAAC,CAAA;IACd,CAAC;IAED,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAC5E,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CACrB,CAAA;IACD,OAAO,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;AACrE,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACtB,QAAmB,EACnB,IAAe,EACf,MAAiB,EACjB,SAAiB,EACN,EAAE;IACb,MAAM,GAAG,GAAc,EAAE,CAAA;IACzB,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QAC/B,MAAM,QAAQ,GAAkB,WAAW,CACzC,aAAa,EACb,SAAS,EACT,WAAW,CACZ,CAAA;QACD,MAAM,GAAG,GAAG,EAAE,CAAA;QACd,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,aAAa,CAAC,WAAW;gBAC5B,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,CAAA;gBACnD,MAAK;YACP,KAAK,aAAa,CAAC,SAAS;gBAC1B,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;gBACjD,MAAK;YACP,KAAK,aAAa,CAAC,aAAa;gBAC9B,MAAK;YACP,KAAK,aAAa,CAAC,eAAe;gBAChC,IAAI,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC;oBACpC,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,CAAA;gBACrD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;gBAC5D,CAAC;gBACD,MAAK;YACP,KAAK,aAAa,CAAC,mBAAmB;gBACpC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;oBACzC,MAAM,YAAY,GAAG;wBACnB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC;qBAClD,CAAA;oBACD,MAAM,UAAU,GAAG;wBACjB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC;qBAChD,CAAA;oBACD,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;gBACvD,CAAC;gBACD,MAAK;YACP,KAAK,aAAa,CAAC,iBAAiB;gBAClC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,CAAC;oBACvC,MAAM,QAAQ,GAAG;wBACf,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC;qBAC9C,CAAA;oBACD,MAAM,YAAY,GAAG;wBACnB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC;qBAClD,CAAA;oBACD,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,CAAC,CAAA;gBACrD,CAAC;gBACD,MAAK;YACP,KAAK,aAAa,CAAC,GAAG;gBACpB,IAAI,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC;oBACpC,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,CAAA;gBACrD,CAAC;qBAAM,IAAI,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,CAAC;oBAC7C,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,CAAA;gBACrD,CAAC;qBAAM,IAAI,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;oBAC/C,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;gBACnD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;gBACvE,CAAC;gBACD,MAAK;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACf,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
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.14037427096-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.14037427096-1",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.2.10",
|
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.0.0-dev-3.
|
|
4
|
+
"version": "1.0.0-dev-3.14037427096-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|