@teambit/merge-lanes 1.0.215 → 1.0.217
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<testsuites tests="0" failures="0" errors="0" skipped="0">
|
|
3
|
-
<testsuite name="teambit.lanes/merge-lanes@1.0.
|
|
3
|
+
<testsuite name="teambit.lanes/merge-lanes@1.0.217" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -1093,7 +1093,7 @@
|
|
|
1093
1093
|
"line": 41,
|
|
1094
1094
|
"character": 3
|
|
1095
1095
|
},
|
|
1096
|
-
"signature": "(property) mergeStrategy: \"
|
|
1096
|
+
"signature": "(property) mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
|
|
1097
1097
|
"name": "mergeStrategy",
|
|
1098
1098
|
"type": {
|
|
1099
1099
|
"__schema": "TypeRefSchema",
|
|
@@ -1374,7 +1374,7 @@
|
|
|
1374
1374
|
"line": 55,
|
|
1375
1375
|
"character": 3
|
|
1376
1376
|
},
|
|
1377
|
-
"signature": "(property) resolveUnrelated?: \"
|
|
1377
|
+
"signature": "(property) resolveUnrelated?: \"manual\" | \"ours\" | \"theirs\" | undefined",
|
|
1378
1378
|
"name": "resolveUnrelated",
|
|
1379
1379
|
"type": {
|
|
1380
1380
|
"__schema": "TypeRefSchema",
|
|
@@ -3515,7 +3515,7 @@
|
|
|
3515
3515
|
"componentId": {
|
|
3516
3516
|
"scope": "teambit.lanes",
|
|
3517
3517
|
"name": "merge-lanes",
|
|
3518
|
-
"version": "1.0.
|
|
3518
|
+
"version": "1.0.217"
|
|
3519
3519
|
},
|
|
3520
3520
|
"taggedModuleExports": []
|
|
3521
3521
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merge-lanes",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.217",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.lanes",
|
|
8
8
|
"name": "merge-lanes",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.217"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -20,17 +20,17 @@
|
|
|
20
20
|
"@teambit/harmony": "0.4.6",
|
|
21
21
|
"@teambit/component-id": "1.2.0",
|
|
22
22
|
"@teambit/logger": "0.0.951",
|
|
23
|
-
"@teambit/scope": "1.0.
|
|
24
|
-
"@teambit/checkout": "1.0.
|
|
23
|
+
"@teambit/scope": "1.0.217",
|
|
24
|
+
"@teambit/checkout": "1.0.217",
|
|
25
25
|
"@teambit/cli": "0.0.858",
|
|
26
26
|
"@teambit/global-config": "0.0.861",
|
|
27
|
-
"@teambit/merging": "1.0.
|
|
28
|
-
"@teambit/remove": "1.0.
|
|
29
|
-
"@teambit/config-merger": "0.0.
|
|
30
|
-
"@teambit/export": "1.0.
|
|
31
|
-
"@teambit/importer": "1.0.
|
|
32
|
-
"@teambit/lanes": "1.0.
|
|
33
|
-
"@teambit/workspace": "1.0.
|
|
27
|
+
"@teambit/merging": "1.0.217",
|
|
28
|
+
"@teambit/remove": "1.0.217",
|
|
29
|
+
"@teambit/config-merger": "0.0.84",
|
|
30
|
+
"@teambit/export": "1.0.217",
|
|
31
|
+
"@teambit/importer": "1.0.217",
|
|
32
|
+
"@teambit/lanes": "1.0.217",
|
|
33
|
+
"@teambit/workspace": "1.0.217"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/fs-extra": "9.0.7",
|
|
File without changes
|