@teambit/merging 1.0.219 → 1.0.221

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.
Files changed (4) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +11 -11
  3. package/package.json +15 -15
  4. /package/dist/{preview-1712174136349.js → preview-1712287228511.js} +0 -0
package/artifacts/__bit_junit.xml CHANGED
@@ -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.219" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.221" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -1473,7 +1473,7 @@
1473
1473
  "line": 218,
1474
1474
  "character": 5
1475
1475
  },
1476
- "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
1476
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1477
1477
  "name": "mergeStrategy",
1478
1478
  "type": {
1479
1479
  "__schema": "TypeRefSchema",
@@ -1691,7 +1691,7 @@
1691
1691
  "line": 218,
1692
1692
  "character": 5
1693
1693
  },
1694
- "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
1694
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1695
1695
  "name": "mergeStrategy",
1696
1696
  "type": {
1697
1697
  "__schema": "TypeRefSchema",
@@ -3028,7 +3028,7 @@
3028
3028
  "line": 82,
3029
3029
  "character": 1
3030
3030
  },
3031
- "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
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",
@@ -3609,7 +3609,7 @@
3609
3609
  "line": 76,
3610
3610
  "character": 7
3611
3611
  },
3612
- "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
3612
+ "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
3613
3613
  "name": "autoMergeResolve",
3614
3614
  "type": {
3615
3615
  "__schema": "TypeRefSchema",
@@ -3834,7 +3834,7 @@
3834
3834
  "line": 76,
3835
3835
  "character": 7
3836
3836
  },
3837
- "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
3837
+ "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
3838
3838
  "name": "autoMergeResolve",
3839
3839
  "type": {
3840
3840
  "__schema": "TypeRefSchema",
@@ -4029,7 +4029,7 @@
4029
4029
  "_legacy": {
4030
4030
  "scope": "teambit.component",
4031
4031
  "name": "merging",
4032
- "version": "1.0.219"
4032
+ "version": "1.0.221"
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]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
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",
@@ -6649,7 +6649,7 @@
6649
6649
  "line": 218,
6650
6650
  "character": 5
6651
6651
  },
6652
- "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
6652
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
6653
6653
  "name": "mergeStrategy",
6654
6654
  "type": {
6655
6655
  "__schema": "TypeRefSchema",
@@ -6867,7 +6867,7 @@
6867
6867
  "line": 218,
6868
6868
  "character": 5
6869
6869
  },
6870
- "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
6870
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
6871
6871
  "name": "mergeStrategy",
6872
6872
  "type": {
6873
6873
  "__schema": "TypeRefSchema",
@@ -7597,7 +7597,7 @@
7597
7597
  "line": 56,
7598
7598
  "character": 3
7599
7599
  },
7600
- "signature": "(property) strategy: \"manual\" | \"theirs\" | \"ours\"",
7600
+ "signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
7601
7601
  "name": "strategy",
7602
7602
  "type": {
7603
7603
  "__schema": "TypeRefSchema",
@@ -7734,7 +7734,7 @@
7734
7734
  "componentId": {
7735
7735
  "scope": "teambit.component",
7736
7736
  "name": "merging",
7737
- "version": "1.0.219"
7737
+ "version": "1.0.221"
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.219",
3
+ "version": "1.0.221",
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.219"
9
+ "version": "1.0.221"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -16,19 +16,19 @@
16
16
  "@teambit/component-id": "1.2.0",
17
17
  "@teambit/lane-id": "0.0.311",
18
18
  "@teambit/harmony": "0.4.6",
19
- "@teambit/cli": "0.0.858",
20
- "@teambit/config-merger": "0.0.86",
21
- "@teambit/global-config": "0.0.861",
22
- "@teambit/importer": "1.0.219",
23
- "@teambit/logger": "0.0.951",
24
- "@teambit/scope": "1.0.219",
25
- "@teambit/workspace": "1.0.219",
26
- "@teambit/checkout": "1.0.219",
27
- "@teambit/component-writer": "1.0.219",
28
- "@teambit/config": "0.0.970",
29
- "@teambit/install": "1.0.219",
30
- "@teambit/remove": "1.0.219",
31
- "@teambit/snapping": "1.0.219"
19
+ "@teambit/cli": "0.0.859",
20
+ "@teambit/config-merger": "0.0.88",
21
+ "@teambit/global-config": "0.0.862",
22
+ "@teambit/importer": "1.0.221",
23
+ "@teambit/logger": "0.0.952",
24
+ "@teambit/scope": "1.0.221",
25
+ "@teambit/workspace": "1.0.221",
26
+ "@teambit/checkout": "1.0.221",
27
+ "@teambit/component-writer": "1.0.221",
28
+ "@teambit/config": "0.0.972",
29
+ "@teambit/install": "1.0.221",
30
+ "@teambit/remove": "1.0.221",
31
+ "@teambit/snapping": "1.0.221"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@types/lodash": "4.14.165",