@teambit/merging 1.0.237 → 1.0.239
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.component/merging@1.0.
|
|
3
|
+
<testsuite name="teambit.component/merging@1.0.239" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -3028,7 +3028,7 @@
|
|
|
3028
3028
|
"line": 82,
|
|
3029
3029
|
"character": 1
|
|
3030
3030
|
},
|
|
3031
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"
|
|
3031
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"merged\" | \"binaryConflict\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
3032
3032
|
"name": "FilesStatus",
|
|
3033
3033
|
"type": {
|
|
3034
3034
|
"__schema": "TypeLiteralSchema",
|
|
@@ -4029,7 +4029,7 @@
|
|
|
4029
4029
|
"_legacy": {
|
|
4030
4030
|
"scope": "teambit.component",
|
|
4031
4031
|
"name": "merging",
|
|
4032
|
-
"version": "1.0.
|
|
4032
|
+
"version": "1.0.239"
|
|
4033
4033
|
},
|
|
4034
4034
|
"_scope": "teambit.component"
|
|
4035
4035
|
}
|
|
@@ -5205,7 +5205,7 @@
|
|
|
5205
5205
|
"line": 82,
|
|
5206
5206
|
"character": 1
|
|
5207
5207
|
},
|
|
5208
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"
|
|
5208
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"merged\" | \"binaryConflict\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
5209
5209
|
"name": "FilesStatus",
|
|
5210
5210
|
"type": {
|
|
5211
5211
|
"__schema": "TypeLiteralSchema",
|
|
@@ -7734,7 +7734,7 @@
|
|
|
7734
7734
|
"componentId": {
|
|
7735
7735
|
"scope": "teambit.component",
|
|
7736
7736
|
"name": "merging",
|
|
7737
|
-
"version": "1.0.
|
|
7737
|
+
"version": "1.0.239"
|
|
7738
7738
|
},
|
|
7739
7739
|
"taggedModuleExports": []
|
|
7740
7740
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merging",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.239",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/merging",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "merging",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.239"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -17,18 +17,18 @@
|
|
|
17
17
|
"@teambit/lane-id": "0.0.311",
|
|
18
18
|
"@teambit/harmony": "0.4.6",
|
|
19
19
|
"@teambit/cli": "0.0.862",
|
|
20
|
-
"@teambit/config-merger": "0.0.
|
|
20
|
+
"@teambit/config-merger": "0.0.106",
|
|
21
21
|
"@teambit/global-config": "0.0.865",
|
|
22
|
-
"@teambit/importer": "1.0.
|
|
22
|
+
"@teambit/importer": "1.0.239",
|
|
23
23
|
"@teambit/logger": "0.0.955",
|
|
24
|
-
"@teambit/scope": "1.0.
|
|
25
|
-
"@teambit/workspace": "1.0.
|
|
26
|
-
"@teambit/checkout": "1.0.
|
|
27
|
-
"@teambit/component-writer": "1.0.
|
|
28
|
-
"@teambit/config": "0.0.
|
|
29
|
-
"@teambit/install": "1.0.
|
|
30
|
-
"@teambit/remove": "1.0.
|
|
31
|
-
"@teambit/snapping": "1.0.
|
|
24
|
+
"@teambit/scope": "1.0.239",
|
|
25
|
+
"@teambit/workspace": "1.0.239",
|
|
26
|
+
"@teambit/checkout": "1.0.239",
|
|
27
|
+
"@teambit/component-writer": "1.0.239",
|
|
28
|
+
"@teambit/config": "0.0.990",
|
|
29
|
+
"@teambit/install": "1.0.239",
|
|
30
|
+
"@teambit/remove": "1.0.239",
|
|
31
|
+
"@teambit/snapping": "1.0.239"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/lodash": "4.14.165",
|
|
File without changes
|