@teambit/merge-lanes 1.0.285 → 1.0.286
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,6 +1,6 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<testsuites tests="1" failures="0" errors="0" skipped="0">
|
|
3
|
-
<testsuite name="teambit.lanes/merge-lanes@1.0.
|
|
4
|
-
<testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only"/>
|
|
3
|
+
<testsuite name="teambit.lanes/merge-lanes@1.0.286" tests="1" failures="0" errors="0" skipped="0">
|
|
4
|
+
<testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only" time="0.001"/>
|
|
5
5
|
</testsuite>
|
|
6
6
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -1258,7 +1258,7 @@
|
|
|
1258
1258
|
"line": 41,
|
|
1259
1259
|
"character": 3
|
|
1260
1260
|
},
|
|
1261
|
-
"signature": "(property) mergeStrategy: \"
|
|
1261
|
+
"signature": "(property) mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
|
|
1262
1262
|
"name": "mergeStrategy",
|
|
1263
1263
|
"type": {
|
|
1264
1264
|
"__schema": "TypeRefSchema",
|
|
@@ -1539,7 +1539,7 @@
|
|
|
1539
1539
|
"line": 55,
|
|
1540
1540
|
"character": 3
|
|
1541
1541
|
},
|
|
1542
|
-
"signature": "(property) resolveUnrelated?: \"
|
|
1542
|
+
"signature": "(property) resolveUnrelated?: \"manual\" | \"ours\" | \"theirs\" | undefined",
|
|
1543
1543
|
"name": "resolveUnrelated",
|
|
1544
1544
|
"type": {
|
|
1545
1545
|
"__schema": "TypeRefSchema",
|
|
@@ -3924,7 +3924,7 @@
|
|
|
3924
3924
|
"componentId": {
|
|
3925
3925
|
"scope": "teambit.lanes",
|
|
3926
3926
|
"name": "merge-lanes",
|
|
3927
|
-
"version": "1.0.
|
|
3927
|
+
"version": "1.0.286"
|
|
3928
3928
|
},
|
|
3929
3929
|
"taggedModuleExports": []
|
|
3930
3930
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merge-lanes",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.286",
|
|
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.286"
|
|
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.958",
|
|
23
|
-
"@teambit/scope": "1.0.
|
|
24
|
-
"@teambit/checkout": "1.0.
|
|
23
|
+
"@teambit/scope": "1.0.286",
|
|
24
|
+
"@teambit/checkout": "1.0.286",
|
|
25
25
|
"@teambit/cli": "0.0.865",
|
|
26
26
|
"@teambit/global-config": "0.0.868",
|
|
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.286",
|
|
28
|
+
"@teambit/remove": "1.0.286",
|
|
29
|
+
"@teambit/config-merger": "0.0.153",
|
|
30
|
+
"@teambit/export": "1.0.286",
|
|
31
|
+
"@teambit/importer": "1.0.286",
|
|
32
|
+
"@teambit/lanes": "1.0.286",
|
|
33
|
+
"@teambit/workspace": "1.0.286"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/fs-extra": "9.0.7",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@teambit/harmony.envs.core-aspect-env": "0.0.33",
|
|
42
42
|
"@teambit/component.testing.mock-components": "0.0.203",
|
|
43
43
|
"@teambit/harmony.testing.load-aspect": "0.0.198",
|
|
44
|
-
"@teambit/snapping": "1.0.
|
|
44
|
+
"@teambit/snapping": "1.0.286",
|
|
45
45
|
"@teambit/workspace.testing.mock-workspace": "0.0.27"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
File without changes
|