@teambit/harmony.content.cli-reference 2.0.272 → 2.0.273

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 (9) hide show
  1. package/cli-reference.docs.mdx +1 -1
  2. package/cli-reference.json +6 -6
  3. package/cli-reference.mdx +5 -5
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +6 -6
  6. package/dist/cli-reference.mdx.js +15 -5
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1715052001040.js → preview-1715115990259.js} +2 -2
  9. package/package.json +2 -2
package/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.157'
2
+ description: 'Bit command synopses. Bit version: 1.6.158'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/cli-reference.json CHANGED
@@ -3174,7 +3174,7 @@
3174
3174
  "when a component is modified and the merge process found conflicts, display options to resolve them"
3175
3175
  ],
3176
3176
  [
3177
- "",
3177
+ "r",
3178
3178
  "auto-merge-resolve <merge-strategy>",
3179
3179
  "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3180
3180
  ],
@@ -3304,7 +3304,7 @@
3304
3304
  "alias": "pop",
3305
3305
  "options": [
3306
3306
  [
3307
- "",
3307
+ "r",
3308
3308
  "auto-merge-resolve <merge-strategy>",
3309
3309
  "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3310
3310
  ],
@@ -3541,7 +3541,7 @@
3541
3541
  "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
3542
3542
  ],
3543
3543
  [
3544
- "",
3544
+ "r",
3545
3545
  "auto-merge-resolve <merge-strategy>",
3546
3546
  "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
3547
3547
  ],
@@ -3670,7 +3670,7 @@
3670
3670
  "switch to the head of the lane/main (fetches the latest changes from the remote)"
3671
3671
  ],
3672
3672
  [
3673
- "",
3673
+ "r",
3674
3674
  "auto-merge-resolve <merge-strategy>",
3675
3675
  "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
3676
3676
  ],
@@ -3993,7 +3993,7 @@
3993
3993
  "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
3994
3994
  ],
3995
3995
  [
3996
- "",
3996
+ "r",
3997
3997
  "auto-merge-resolve <merge-strategy>",
3998
3998
  "in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3999
3999
  ],
@@ -4154,7 +4154,7 @@
4154
4154
  "switch to the head of the lane/main (fetches the latest changes from the remote)"
4155
4155
  ],
4156
4156
  [
4157
- "",
4157
+ "r",
4158
4158
  "auto-merge-resolve <merge-strategy>",
4159
4159
  "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
4160
4160
  ],
package/cli-reference.mdx CHANGED
@@ -297,7 +297,7 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
297
297
  | **Option** | **Option alias** | **Description** |
298
298
  | --------------------------------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------------- |
299
299
  | `--interactive-merge` | `-i` | when a component is modified and the merge process found conflicts, display options to resolve them |
300
- | `--auto-merge-resolve <merge-strategy>` | | in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
300
+ | `--auto-merge-resolve <merge-strategy>` | `-r` | in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
301
301
  | `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
302
302
  | `--all` | `-a` | all components |
303
303
  | `--workspace-only` | `-e` | only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace |
@@ -1027,7 +1027,7 @@ when no package is specified, all workspace dependencies are installed and all w
1027
1027
  | **Option** | **Option alias** | **Description** |
1028
1028
  | --------------------------------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
1029
1029
  | `--head` | `-h` | switch to the head of the lane/main (fetches the latest changes from the remote) |
1030
- | `--auto-merge-resolve <merge-strategy>` | | merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual" |
1030
+ | `--auto-merge-resolve <merge-strategy>` | `-r` | merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual" |
1031
1031
  | `--get-all` | `-a` | DEPRECATED. this is currently the default behavior |
1032
1032
  | `--workspace-only` | | checkout only the components in the workspace to the selected lane |
1033
1033
  | `--skip-dependency-installation` | `-x` | do not install dependencies of the imported components |
@@ -1228,7 +1228,7 @@ this flag keeps the history of one end and saves a reference to the other end. t
1228
1228
  | **Option** | **Option alias** | **Description** |
1229
1229
  | --------------------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
1230
1230
  | `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
1231
- | `--auto-merge-resolve <merge-strategy>` | | in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
1231
+ | `--auto-merge-resolve <merge-strategy>` | `-r` | in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
1232
1232
  | `--ours` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications |
1233
1233
  | `--theirs` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes |
1234
1234
  | `--workspace` | | merge only lane components that are in the current workspace |
@@ -1424,7 +1424,7 @@ you can use a pattern for multiple ids, such as bit merge "utils/\*". (wrap the
1424
1424
  | `--ours` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification |
1425
1425
  | `--theirs` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version |
1426
1426
  | `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
1427
- | `--auto-merge-resolve <merge-strategy>` | | in case of a conflict, resolve according to the strategy: [ours, theirs, manual] |
1427
+ | `--auto-merge-resolve <merge-strategy>` | `-r` | in case of a conflict, resolve according to the strategy: [ours, theirs, manual] |
1428
1428
  | `--abort` | | in case of an unresolved merge, revert to pre-merge state |
1429
1429
  | `--resolve` | | mark an unresolved merge as resolved and create a new snap with the changes |
1430
1430
  | `--no-snap` | | do not auto snap even if the merge completed without conflicts |
@@ -1958,7 +1958,7 @@ optionally, provide [pattern] to limit the fork to specific components
1958
1958
 
1959
1959
  | **Option** | **Option alias** | **Description** |
1960
1960
  | --------------------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------- |
1961
- | `--auto-merge-resolve <merge-strategy>` | | in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
1961
+ | `--auto-merge-resolve <merge-strategy>` | `-r` | in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
1962
1962
  | `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
1963
1963
  | `--force-ours` | | do not merge, preserve local files as is |
1964
1964
  | `--force-theirs` | | do not merge, just overwrite with incoming files |
package/dist/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.157'
2
+ description: 'Bit command synopses. Bit version: 1.6.158'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/dist/cli-reference.json CHANGED
@@ -3174,7 +3174,7 @@
3174
3174
  "when a component is modified and the merge process found conflicts, display options to resolve them"
3175
3175
  ],
3176
3176
  [
3177
- "",
3177
+ "r",
3178
3178
  "auto-merge-resolve <merge-strategy>",
3179
3179
  "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3180
3180
  ],
@@ -3304,7 +3304,7 @@
3304
3304
  "alias": "pop",
3305
3305
  "options": [
3306
3306
  [
3307
- "",
3307
+ "r",
3308
3308
  "auto-merge-resolve <merge-strategy>",
3309
3309
  "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3310
3310
  ],
@@ -3541,7 +3541,7 @@
3541
3541
  "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
3542
3542
  ],
3543
3543
  [
3544
- "",
3544
+ "r",
3545
3545
  "auto-merge-resolve <merge-strategy>",
3546
3546
  "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
3547
3547
  ],
@@ -3670,7 +3670,7 @@
3670
3670
  "switch to the head of the lane/main (fetches the latest changes from the remote)"
3671
3671
  ],
3672
3672
  [
3673
- "",
3673
+ "r",
3674
3674
  "auto-merge-resolve <merge-strategy>",
3675
3675
  "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
3676
3676
  ],
@@ -3993,7 +3993,7 @@
3993
3993
  "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
3994
3994
  ],
3995
3995
  [
3996
- "",
3996
+ "r",
3997
3997
  "auto-merge-resolve <merge-strategy>",
3998
3998
  "in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3999
3999
  ],
@@ -4154,7 +4154,7 @@
4154
4154
  "switch to the head of the lane/main (fetches the latest changes from the remote)"
4155
4155
  ],
4156
4156
  [
4157
- "",
4157
+ "r",
4158
4158
  "auto-merge-resolve <merge-strategy>",
4159
4159
  "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
4160
4160
  ],
package/dist/cli-reference.mdx.js CHANGED
@@ -1532,7 +1532,9 @@ function MDXContent(_ref) {
1532
1532
  }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
1533
1533
  parentName: "tr",
1534
1534
  "align": "center"
1535
- }), (0, _react2.mdx)("td", {
1535
+ }, (0, _react2.mdx)("inlineCode", {
1536
+ parentName: "td"
1537
+ }, "-r")), (0, _react2.mdx)("td", {
1536
1538
  parentName: "tr",
1537
1539
  "align": null
1538
1540
  }, "in case of merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
@@ -5330,7 +5332,9 @@ function MDXContent(_ref) {
5330
5332
  }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
5331
5333
  parentName: "tr",
5332
5334
  "align": "center"
5333
- }), (0, _react2.mdx)("td", {
5335
+ }, (0, _react2.mdx)("inlineCode", {
5336
+ parentName: "td"
5337
+ }, "-r")), (0, _react2.mdx)("td", {
5334
5338
  parentName: "tr",
5335
5339
  "align": null
5336
5340
  }, "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\"")), (0, _react2.mdx)("tr", {
@@ -6285,7 +6289,9 @@ function MDXContent(_ref) {
6285
6289
  }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
6286
6290
  parentName: "tr",
6287
6291
  "align": "center"
6288
- }), (0, _react2.mdx)("td", {
6292
+ }, (0, _react2.mdx)("inlineCode", {
6293
+ parentName: "td"
6294
+ }, "-r")), (0, _react2.mdx)("td", {
6289
6295
  parentName: "tr",
6290
6296
  "align": null
6291
6297
  }, "in case of a merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
@@ -7509,7 +7515,9 @@ function MDXContent(_ref) {
7509
7515
  }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
7510
7516
  parentName: "tr",
7511
7517
  "align": "center"
7512
- }), (0, _react2.mdx)("td", {
7518
+ }, (0, _react2.mdx)("inlineCode", {
7519
+ parentName: "td"
7520
+ }, "-r")), (0, _react2.mdx)("td", {
7513
7521
  parentName: "tr",
7514
7522
  "align": null
7515
7523
  }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
@@ -10095,7 +10103,9 @@ function MDXContent(_ref) {
10095
10103
  }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
10096
10104
  parentName: "tr",
10097
10105
  "align": "center"
10098
- }), (0, _react2.mdx)("td", {
10106
+ }, (0, _react2.mdx)("inlineCode", {
10107
+ parentName: "td"
10108
+ }, "-r")), (0, _react2.mdx)("td", {
10099
10109
  parentName: "tr",
10100
10110
  "align": null
10101
10111
  }, "in case of merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {