@teambit/harmony.content.cli-reference 1.95.196 → 1.95.197

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 (11) hide show
  1. package/cli-reference.docs.mdx +1 -1
  2. package/cli-reference.json +28 -13
  3. package/cli-reference.mdx +47 -44
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +28 -13
  6. package/dist/cli-reference.mdx.js +50 -17
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1691637443382.js → preview-1691723880005.js} +2 -2
  9. package/package-tar/teambit-harmony.content.cli-reference-1.95.197.tgz +0 -0
  10. package/package.json +2 -2
  11. package/package-tar/teambit-harmony.content.cli-reference-1.95.196.tgz +0 -0
package/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 0.2.20'
2
+ description: 'Bit command synopses. Bit version: 0.2.21'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/cli-reference.json CHANGED
@@ -2658,19 +2658,24 @@
2658
2658
  "when a component is modified and the merge process found conflicts, display options to resolve them"
2659
2659
  ],
2660
2660
  [
2661
- "o",
2661
+ "",
2662
2662
  "ours",
2663
- "in case of a conflict, override the used version with the current modification"
2663
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
2664
2664
  ],
2665
2665
  [
2666
- "t",
2666
+ "",
2667
2667
  "theirs",
2668
- "in case of a conflict, override the current modification with the specified version"
2668
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
2669
2669
  ],
2670
2670
  [
2671
- "m",
2671
+ "",
2672
2672
  "manual",
2673
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
2673
+ "DEPRECATED. use --auto-merge-resolve"
2674
+ ],
2675
+ [
2676
+ "",
2677
+ "auto-merge-resolve <merge-strategy>",
2678
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
2674
2679
  ],
2675
2680
  [
2676
2681
  "r",
@@ -2872,17 +2877,22 @@
2872
2877
  [
2873
2878
  "",
2874
2879
  "ours",
2875
- "in case of a conflict, override the used version with the current modification"
2880
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
2876
2881
  ],
2877
2882
  [
2878
2883
  "",
2879
2884
  "theirs",
2880
- "in case of a conflict, override the current modification with the specified version"
2885
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
2881
2886
  ],
2882
2887
  [
2883
2888
  "",
2884
2889
  "manual",
2885
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
2890
+ "DEPRECATED. use --auto-merge-resolve"
2891
+ ],
2892
+ [
2893
+ "",
2894
+ "auto-merge-resolve <merge-strategy>",
2895
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
2886
2896
  ],
2887
2897
  [
2888
2898
  "",
@@ -3246,7 +3256,7 @@
3246
3256
  [
3247
3257
  "",
3248
3258
  "update-main",
3249
- "NOT IMPLEMENTED YET. mark as removed on main after merging this lane into main"
3259
+ "EXPERIMENTAL. mark as removed on main after merging this lane into main"
3250
3260
  ]
3251
3261
  ],
3252
3262
  "description": "remove components when on a lane",
@@ -3267,17 +3277,22 @@
3267
3277
  [
3268
3278
  "",
3269
3279
  "ours",
3270
- "in case of a conflict, override the used version with the current modification"
3280
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
3271
3281
  ],
3272
3282
  [
3273
3283
  "",
3274
3284
  "theirs",
3275
- "in case of a conflict, override the current modification with the specified version"
3285
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
3276
3286
  ],
3277
3287
  [
3278
3288
  "",
3279
3289
  "manual",
3280
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
3290
+ "DEPRECATED. use --auto-merge-resolve"
3291
+ ],
3292
+ [
3293
+ "",
3294
+ "auto-merge-resolve <merge-strategy>",
3295
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
3281
3296
  ],
3282
3297
  [
3283
3298
  "",
package/cli-reference.mdx CHANGED
@@ -287,17 +287,18 @@ with no args, only workspace's capsules are deleted
287
287
  | `to` | permitted values: [head, latest, reset, specific-version]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes |
288
288
  | `component-pattern` | component name, component id, or component pattern. use component pattern to select multiple components. use comma to separate patterns and "!" to exclude. e.g. "ui/\*\*, !ui/button" wrap the pattern with quotes |
289
289
 
290
- | **Option** | **Option alias** | **Description** |
291
- | -------------------------------- | :--------------: | --------------------------------------------------------------------------------------------------- |
292
- | `--interactive-merge` | `-i` | when a component is modified and the merge process found conflicts, display options to resolve them |
293
- | `--ours` | `-o` | in case of a conflict, override the used version with the current modification |
294
- | `--theirs` | `-t` | in case of a conflict, override the current modification with the specified version |
295
- | `--manual` | `-m` | in case of a conflict, leave the files with a conflict state to resolve them manually later |
296
- | `--reset` | `-r` | revert changes that were not snapped/tagged |
297
- | `--all` | `-a` | all components |
298
- | `--workspace-only` | `-e` | when on a lane, avoid introducing new components from the remote lane that do not exist locally |
299
- | `--verbose` | `-v` | showing verbose output for inspection |
300
- | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
290
+ | **Option** | **Option alias** | **Description** |
291
+ | --------------------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------- |
292
+ | `--interactive-merge` | `-i` | when a component is modified and the merge process found conflicts, display options to resolve them |
293
+ | `--ours` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact |
294
+ | `--theirs` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code |
295
+ | `--manual` | | DEPRECATED. use --auto-merge-resolve |
296
+ | `--auto-merge-resolve <merge-strategy>` | | in case of a conflict, resolve according to the strategy: [ours, theirs, manual] |
297
+ | `--reset` | `-r` | revert changes that were not snapped/tagged |
298
+ | `--all` | `-a` | all components |
299
+ | `--workspace-only` | `-e` | when on a lane, avoid introducing new components from the remote lane that do not exist locally |
300
+ | `--verbose` | `-v` | showing verbose output for inspection |
301
+ | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
301
302
 
302
303
  ---
303
304
 
@@ -1097,7 +1098,7 @@ in case the components are not part of the lane or the lane is new, it simply re
1097
1098
  | **Option** | **Option alias** | **Description** |
1098
1099
  | ------------------ | :--------------: | ----------------------------------------------------------------------------------- |
1099
1100
  | `--workspace-only` | | do not mark the components as removed. instead, remove them from the workspace only |
1100
- | `--update-main` | | NOT IMPLEMENTED YET. mark as removed on main after merging this lane into main |
1101
+ | `--update-main` | | EXPERIMENTAL. mark as removed on main after merging this lane into main |
1101
1102
 
1102
1103
  ### lane merge
1103
1104
 
@@ -1115,26 +1116,27 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
1115
1116
  | `lane` | lane-name or lane-id (if not exists locally) to merge to the current lane |
1116
1117
  | `pattern` | partially merge the lane with the specified component-pattern |
1117
1118
 
1118
- | **Option** | **Option alias** | **Description** |
1119
- | -------------------------------------- | :--------------: | --------------------------------------------------------------------------------------------------------------------------------------- |
1120
- | `--ours` | | in case of a conflict, override the used version with the current modification |
1121
- | `--theirs` | | in case of a conflict, override the current modification with the specified version |
1122
- | `--manual` | | in case of a conflict, leave the files with a conflict state to resolve them manually later |
1123
- | `--workspace` | | merge only components in a lane that exist in the workspace |
1124
- | `--no-snap` | | do not auto snap in case the merge completed without conflicts |
1125
- | `--tag` | | tag all lane components after merging into main (also tag-merge in case of snap-merge) |
1126
- | `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
1127
- | `--message <message>` | `-m` | override the default message for the auto snap |
1128
- | `--keep-readme` | | skip deleting the lane readme component after merging |
1129
- | `--no-squash` | | relevant for merging lanes into main, which by default squash |
1130
- | `--squash` | | EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash |
1131
- | `--ignore-config-changes` | | allow merging when component are modified due to config changes (such as dependencies) only and not files |
1132
- | `--verbose` | | show details of components that were not merged legitimately |
1133
- | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
1134
- | `--skip-fetch` | | use the current target-lane if exits locally without updating it from the remote |
1135
- | `--include-deps` | | relevant for "--pattern" and "--workspace". merge also dependencies of the given components |
1136
- | `--resolve-unrelated [merge-strategy]` | | relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs" |
1137
- | `--include-non-lane-comps` | | when merging main, include workspace components that are not on the lane (by default only lane components are merged) |
1119
+ | **Option** | **Option alias** | **Description** |
1120
+ | --------------------------------------- | :--------------: | --------------------------------------------------------------------------------------------------------------------------------------- |
1121
+ | `--ours` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact |
1122
+ | `--theirs` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code |
1123
+ | `--manual` | | DEPRECATED. use --auto-merge-resolve |
1124
+ | `--auto-merge-resolve <merge-strategy>` | | in case of a conflict, resolve according to the strategy: [ours, theirs, manual] |
1125
+ | `--workspace` | | merge only components in a lane that exist in the workspace |
1126
+ | `--no-snap` | | do not auto snap in case the merge completed without conflicts |
1127
+ | `--tag` | | tag all lane components after merging into main (also tag-merge in case of snap-merge) |
1128
+ | `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
1129
+ | `--message <message>` | `-m` | override the default message for the auto snap |
1130
+ | `--keep-readme` | | skip deleting the lane readme component after merging |
1131
+ | `--no-squash` | | relevant for merging lanes into main, which by default squash |
1132
+ | `--squash` | | EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash |
1133
+ | `--ignore-config-changes` | | allow merging when component are modified due to config changes (such as dependencies) only and not files |
1134
+ | `--verbose` | | show details of components that were not merged legitimately |
1135
+ | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
1136
+ | `--skip-fetch` | | use the current target-lane if exits locally without updating it from the remote |
1137
+ | `--include-deps` | | relevant for "--pattern" and "--workspace". merge also dependencies of the given components |
1138
+ | `--resolve-unrelated [merge-strategy]` | | relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs" |
1139
+ | `--include-non-lane-comps` | | when merging main, include workspace components that are not on the lane (by default only lane components are merged) |
1138
1140
 
1139
1141
  ### lane merge-abort
1140
1142
 
@@ -1283,18 +1285,19 @@ you can use a pattern for multiple ids, such as bit merge "utils/\*". (wrap the
1283
1285
 
1284
1286
  `bit merge [ids...]`
1285
1287
 
1286
- | **Option** | **Option alias** | **Description** |
1287
- | -------------------------------- | :--------------: | ------------------------------------------------------------------------------------------- |
1288
- | `--ours` | | in case of a conflict, override the used version with the current modification |
1289
- | `--theirs` | | in case of a conflict, override the current modification with the specified version |
1290
- | `--manual` | | in case of a conflict, leave the files with a conflict state to resolve them manually later |
1291
- | `--abort` | | in case of an unresolved merge, revert to the state before the merge began |
1292
- | `--resolve` | | mark an unresolved merge as resolved and create a new snap with the changes |
1293
- | `--no-snap` | | do not auto snap in case the merge completed without conflicts |
1294
- | `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
1295
- | `--verbose` | | show details of components that were not merged legitimately |
1296
- | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
1297
- | `--message <message>` | `-m` | override the default message for the auto snap |
1288
+ | **Option** | **Option alias** | **Description** |
1289
+ | --------------------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------- |
1290
+ | `--ours` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact |
1291
+ | `--theirs` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code |
1292
+ | `--manual` | | DEPRECATED. use --auto-merge-resolve |
1293
+ | `--auto-merge-resolve <merge-strategy>` | | in case of a conflict, resolve according to the strategy: [ours, theirs, manual] |
1294
+ | `--abort` | | in case of an unresolved merge, revert to the state before the merge began |
1295
+ | `--resolve` | | mark an unresolved merge as resolved and create a new snap with the changes |
1296
+ | `--no-snap` | | do not auto snap in case the merge completed without conflicts |
1297
+ | `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
1298
+ | `--verbose` | | show details of components that were not merged legitimately |
1299
+ | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
1300
+ | `--message <message>` | `-m` | override the default message for the auto snap |
1298
1301
 
1299
1302
  ---
1300
1303
 
package/dist/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 0.2.20'
2
+ description: 'Bit command synopses. Bit version: 0.2.21'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/dist/cli-reference.json CHANGED
@@ -2658,19 +2658,24 @@
2658
2658
  "when a component is modified and the merge process found conflicts, display options to resolve them"
2659
2659
  ],
2660
2660
  [
2661
- "o",
2661
+ "",
2662
2662
  "ours",
2663
- "in case of a conflict, override the used version with the current modification"
2663
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
2664
2664
  ],
2665
2665
  [
2666
- "t",
2666
+ "",
2667
2667
  "theirs",
2668
- "in case of a conflict, override the current modification with the specified version"
2668
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
2669
2669
  ],
2670
2670
  [
2671
- "m",
2671
+ "",
2672
2672
  "manual",
2673
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
2673
+ "DEPRECATED. use --auto-merge-resolve"
2674
+ ],
2675
+ [
2676
+ "",
2677
+ "auto-merge-resolve <merge-strategy>",
2678
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
2674
2679
  ],
2675
2680
  [
2676
2681
  "r",
@@ -2872,17 +2877,22 @@
2872
2877
  [
2873
2878
  "",
2874
2879
  "ours",
2875
- "in case of a conflict, override the used version with the current modification"
2880
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
2876
2881
  ],
2877
2882
  [
2878
2883
  "",
2879
2884
  "theirs",
2880
- "in case of a conflict, override the current modification with the specified version"
2885
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
2881
2886
  ],
2882
2887
  [
2883
2888
  "",
2884
2889
  "manual",
2885
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
2890
+ "DEPRECATED. use --auto-merge-resolve"
2891
+ ],
2892
+ [
2893
+ "",
2894
+ "auto-merge-resolve <merge-strategy>",
2895
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
2886
2896
  ],
2887
2897
  [
2888
2898
  "",
@@ -3246,7 +3256,7 @@
3246
3256
  [
3247
3257
  "",
3248
3258
  "update-main",
3249
- "NOT IMPLEMENTED YET. mark as removed on main after merging this lane into main"
3259
+ "EXPERIMENTAL. mark as removed on main after merging this lane into main"
3250
3260
  ]
3251
3261
  ],
3252
3262
  "description": "remove components when on a lane",
@@ -3267,17 +3277,22 @@
3267
3277
  [
3268
3278
  "",
3269
3279
  "ours",
3270
- "in case of a conflict, override the used version with the current modification"
3280
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
3271
3281
  ],
3272
3282
  [
3273
3283
  "",
3274
3284
  "theirs",
3275
- "in case of a conflict, override the current modification with the specified version"
3285
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
3276
3286
  ],
3277
3287
  [
3278
3288
  "",
3279
3289
  "manual",
3280
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
3290
+ "DEPRECATED. use --auto-merge-resolve"
3291
+ ],
3292
+ [
3293
+ "",
3294
+ "auto-merge-resolve <merge-strategy>",
3295
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
3281
3296
  ],
3282
3297
  [
3283
3298
  "",
package/dist/cli-reference.mdx.js CHANGED
@@ -1463,12 +1463,10 @@ function MDXContent(_ref) {
1463
1463
  }, "--ours")), (0, _react2.mdx)("td", {
1464
1464
  parentName: "tr",
1465
1465
  "align": "center"
1466
- }, (0, _react2.mdx)("inlineCode", {
1467
- parentName: "td"
1468
- }, "-o")), (0, _react2.mdx)("td", {
1466
+ }), (0, _react2.mdx)("td", {
1469
1467
  parentName: "tr",
1470
1468
  "align": null
1471
- }, "in case of a conflict, override the used version with the current modification")), (0, _react2.mdx)("tr", {
1469
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
1472
1470
  parentName: "tbody"
1473
1471
  }, (0, _react2.mdx)("td", {
1474
1472
  parentName: "tr",
@@ -1478,12 +1476,10 @@ function MDXContent(_ref) {
1478
1476
  }, "--theirs")), (0, _react2.mdx)("td", {
1479
1477
  parentName: "tr",
1480
1478
  "align": "center"
1481
- }, (0, _react2.mdx)("inlineCode", {
1482
- parentName: "td"
1483
- }, "-t")), (0, _react2.mdx)("td", {
1479
+ }), (0, _react2.mdx)("td", {
1484
1480
  parentName: "tr",
1485
1481
  "align": null
1486
- }, "in case of a conflict, override the current modification with the specified version")), (0, _react2.mdx)("tr", {
1482
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
1487
1483
  parentName: "tbody"
1488
1484
  }, (0, _react2.mdx)("td", {
1489
1485
  parentName: "tr",
@@ -1493,12 +1489,23 @@ function MDXContent(_ref) {
1493
1489
  }, "--manual")), (0, _react2.mdx)("td", {
1494
1490
  parentName: "tr",
1495
1491
  "align": "center"
1492
+ }), (0, _react2.mdx)("td", {
1493
+ parentName: "tr",
1494
+ "align": null
1495
+ }, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
1496
+ parentName: "tbody"
1497
+ }, (0, _react2.mdx)("td", {
1498
+ parentName: "tr",
1499
+ "align": null
1496
1500
  }, (0, _react2.mdx)("inlineCode", {
1497
1501
  parentName: "td"
1498
- }, "-m")), (0, _react2.mdx)("td", {
1502
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
1503
+ parentName: "tr",
1504
+ "align": "center"
1505
+ }), (0, _react2.mdx)("td", {
1499
1506
  parentName: "tr",
1500
1507
  "align": null
1501
- }, "in case of a conflict, leave the files with a conflict state to resolve them manually later")), (0, _react2.mdx)("tr", {
1508
+ }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
1502
1509
  parentName: "tbody"
1503
1510
  }, (0, _react2.mdx)("td", {
1504
1511
  parentName: "tr",
@@ -5334,7 +5341,7 @@ function MDXContent(_ref) {
5334
5341
  }), (0, _react2.mdx)("td", {
5335
5342
  parentName: "tr",
5336
5343
  "align": null
5337
- }, "NOT IMPLEMENTED YET. mark as removed on main after merging this lane into main")))), (0, _react2.mdx)("h3", null, "lane merge"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
5344
+ }, "EXPERIMENTAL. mark as removed on main after merging this lane into main")))), (0, _react2.mdx)("h3", null, "lane merge"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
5338
5345
  parentName: "p"
5339
5346
  }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
5340
5347
  parentName: "p"
@@ -5416,7 +5423,7 @@ function MDXContent(_ref) {
5416
5423
  }), (0, _react2.mdx)("td", {
5417
5424
  parentName: "tr",
5418
5425
  "align": null
5419
- }, "in case of a conflict, override the used version with the current modification")), (0, _react2.mdx)("tr", {
5426
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
5420
5427
  parentName: "tbody"
5421
5428
  }, (0, _react2.mdx)("td", {
5422
5429
  parentName: "tr",
@@ -5429,7 +5436,7 @@ function MDXContent(_ref) {
5429
5436
  }), (0, _react2.mdx)("td", {
5430
5437
  parentName: "tr",
5431
5438
  "align": null
5432
- }, "in case of a conflict, override the current modification with the specified version")), (0, _react2.mdx)("tr", {
5439
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
5433
5440
  parentName: "tbody"
5434
5441
  }, (0, _react2.mdx)("td", {
5435
5442
  parentName: "tr",
@@ -5442,7 +5449,20 @@ function MDXContent(_ref) {
5442
5449
  }), (0, _react2.mdx)("td", {
5443
5450
  parentName: "tr",
5444
5451
  "align": null
5445
- }, "in case of a conflict, leave the files with a conflict state to resolve them manually later")), (0, _react2.mdx)("tr", {
5452
+ }, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
5453
+ parentName: "tbody"
5454
+ }, (0, _react2.mdx)("td", {
5455
+ parentName: "tr",
5456
+ "align": null
5457
+ }, (0, _react2.mdx)("inlineCode", {
5458
+ parentName: "td"
5459
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
5460
+ parentName: "tr",
5461
+ "align": "center"
5462
+ }), (0, _react2.mdx)("td", {
5463
+ parentName: "tr",
5464
+ "align": null
5465
+ }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
5446
5466
  parentName: "tbody"
5447
5467
  }, (0, _react2.mdx)("td", {
5448
5468
  parentName: "tr",
@@ -6456,7 +6476,7 @@ function MDXContent(_ref) {
6456
6476
  }), (0, _react2.mdx)("td", {
6457
6477
  parentName: "tr",
6458
6478
  "align": null
6459
- }, "in case of a conflict, override the used version with the current modification")), (0, _react2.mdx)("tr", {
6479
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
6460
6480
  parentName: "tbody"
6461
6481
  }, (0, _react2.mdx)("td", {
6462
6482
  parentName: "tr",
@@ -6469,7 +6489,7 @@ function MDXContent(_ref) {
6469
6489
  }), (0, _react2.mdx)("td", {
6470
6490
  parentName: "tr",
6471
6491
  "align": null
6472
- }, "in case of a conflict, override the current modification with the specified version")), (0, _react2.mdx)("tr", {
6492
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
6473
6493
  parentName: "tbody"
6474
6494
  }, (0, _react2.mdx)("td", {
6475
6495
  parentName: "tr",
@@ -6482,7 +6502,20 @@ function MDXContent(_ref) {
6482
6502
  }), (0, _react2.mdx)("td", {
6483
6503
  parentName: "tr",
6484
6504
  "align": null
6485
- }, "in case of a conflict, leave the files with a conflict state to resolve them manually later")), (0, _react2.mdx)("tr", {
6505
+ }, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
6506
+ parentName: "tbody"
6507
+ }, (0, _react2.mdx)("td", {
6508
+ parentName: "tr",
6509
+ "align": null
6510
+ }, (0, _react2.mdx)("inlineCode", {
6511
+ parentName: "td"
6512
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
6513
+ parentName: "tr",
6514
+ "align": "center"
6515
+ }), (0, _react2.mdx)("td", {
6516
+ parentName: "tr",
6517
+ "align": null
6518
+ }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
6486
6519
  parentName: "tbody"
6487
6520
  }, (0, _react2.mdx)("td", {
6488
6521
  parentName: "tr",