@teambit/merge-lanes 1.0.162 → 1.0.163
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.163" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -990,7 +990,7 @@
|
|
|
990
990
|
"line": 40,
|
|
991
991
|
"character": 3
|
|
992
992
|
},
|
|
993
|
-
"signature": "(property) mergeStrategy: \"
|
|
993
|
+
"signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
|
|
994
994
|
"name": "mergeStrategy",
|
|
995
995
|
"type": {
|
|
996
996
|
"__schema": "TypeRefSchema",
|
|
@@ -1270,7 +1270,7 @@
|
|
|
1270
1270
|
"line": 54,
|
|
1271
1271
|
"character": 3
|
|
1272
1272
|
},
|
|
1273
|
-
"signature": "(property) resolveUnrelated?: \"
|
|
1273
|
+
"signature": "(property) resolveUnrelated?: \"manual\" | \"theirs\" | \"ours\" | undefined",
|
|
1274
1274
|
"name": "resolveUnrelated",
|
|
1275
1275
|
"type": {
|
|
1276
1276
|
"__schema": "TypeRefSchema",
|
|
@@ -3215,7 +3215,7 @@
|
|
|
3215
3215
|
"componentId": {
|
|
3216
3216
|
"scope": "teambit.lanes",
|
|
3217
3217
|
"name": "merge-lanes",
|
|
3218
|
-
"version": "1.0.
|
|
3218
|
+
"version": "1.0.163"
|
|
3219
3219
|
},
|
|
3220
3220
|
"taggedModuleExports": []
|
|
3221
3221
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merge-lanes",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.163",
|
|
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.163"
|
|
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.944",
|
|
23
|
-
"@teambit/scope": "1.0.
|
|
24
|
-
"@teambit/checkout": "1.0.
|
|
23
|
+
"@teambit/scope": "1.0.163",
|
|
24
|
+
"@teambit/checkout": "1.0.163",
|
|
25
25
|
"@teambit/cli": "0.0.851",
|
|
26
26
|
"@teambit/global-config": "0.0.854",
|
|
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.163",
|
|
28
|
+
"@teambit/remove": "1.0.163",
|
|
29
|
+
"@teambit/config-merger": "0.0.30",
|
|
30
|
+
"@teambit/export": "1.0.163",
|
|
31
|
+
"@teambit/importer": "1.0.163",
|
|
32
|
+
"@teambit/lanes": "1.0.163",
|
|
33
|
+
"@teambit/workspace": "1.0.163"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/fs-extra": "9.0.7",
|
|
File without changes
|