@teambit/harmony.content.cli-reference 2.0.261 → 2.0.262

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,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.146'
2
+ description: 'Bit command synopses. Bit version: 1.6.147'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
@@ -4086,6 +4086,20 @@
4086
4086
  "extendedDescription": "restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state",
4087
4087
  "private": true,
4088
4088
  "remoteOp": true
4089
+ },
4090
+ {
4091
+ "name": "merge-move <new-lane-name>",
4092
+ "alias": "",
4093
+ "options": [
4094
+ [
4095
+ "s",
4096
+ "scope <scope-name>",
4097
+ "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")"
4098
+ ]
4099
+ ],
4100
+ "description": "EXPERIMENT. move the current merge state into a new lane. the current lane will be reset",
4101
+ "extendedDescription": "this command is useful when you got a messy merge state that from one hand you don't want\nto loose the changes, but on the other hand, you want to keep your lane without those changes.\nthis command does the following:\n1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)\n2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.",
4102
+ "remoteOp": true
4089
4103
  }
4090
4104
  ]
4091
4105
  },
package/cli-reference.mdx CHANGED
@@ -1260,6 +1260,22 @@ also, checkout the workspace components according to the restored lane state
1260
1260
  | `--silent` | `-s` | skip confirmation |
1261
1261
  | `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
1262
1262
 
1263
+ ### lane merge-move
1264
+
1265
+ **Usage**: `lane merge-move <new-lane-name>`
1266
+
1267
+ **Description**: EXPERIMENT. move the current merge state into a new lane. the current lane will be reset
1268
+ this command is useful when you got a messy merge state that from one hand you don't want
1269
+ to loose the changes, but on the other hand, you want to keep your lane without those changes.
1270
+ this command does the following:
1271
+
1272
+ 1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)
1273
+ 2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.
1274
+
1275
+ | **Option** | **Option alias** | **Description** |
1276
+ | ---------------------- | :--------------: | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
1277
+ | `--scope <scope-name>` | `-s` | remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with "bit lane change-scope") |
1278
+
1263
1279
  | **Option** | **Option alias** | **Description** |
1264
1280
  | ------------------------------ | :--------------: | ------------------------------------------------------------- |
1265
1281
  | `--details` | `-d` | show more details on the state of each component in each lane |
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.146'
2
+ description: 'Bit command synopses. Bit version: 1.6.147'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
@@ -4086,6 +4086,20 @@
4086
4086
  "extendedDescription": "restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state",
4087
4087
  "private": true,
4088
4088
  "remoteOp": true
4089
+ },
4090
+ {
4091
+ "name": "merge-move <new-lane-name>",
4092
+ "alias": "",
4093
+ "options": [
4094
+ [
4095
+ "s",
4096
+ "scope <scope-name>",
4097
+ "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")"
4098
+ ]
4099
+ ],
4100
+ "description": "EXPERIMENT. move the current merge state into a new lane. the current lane will be reset",
4101
+ "extendedDescription": "this command is useful when you got a messy merge state that from one hand you don't want\nto loose the changes, but on the other hand, you want to keep your lane without those changes.\nthis command does the following:\n1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)\n2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.",
4102
+ "remoteOp": true
4089
4103
  }
4090
4104
  ]
4091
4105
  },
@@ -6569,7 +6569,59 @@ function MDXContent(_ref) {
6569
6569
  }, "-x")), (0, _react2.mdx)("td", {
6570
6570
  parentName: "tr",
6571
6571
  "align": null
6572
- }, "do not install packages of the imported components")))), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
6572
+ }, "do not install packages of the imported components")))), (0, _react2.mdx)("h3", null, "lane merge-move"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
6573
+ parentName: "p"
6574
+ }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
6575
+ parentName: "p"
6576
+ }, "lane merge-move <new-lane-name>")), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
6577
+ parentName: "p"
6578
+ }, "Description"), ": EXPERIMENT. move the current merge state into a new lane. the current lane will be reset", (0, _react2.mdx)("br", {
6579
+ parentName: "p"
6580
+ }), "\n", "this command is useful when you got a messy merge state that from one hand you don't want", (0, _react2.mdx)("br", {
6581
+ parentName: "p"
6582
+ }), "\n", "to loose the changes, but on the other hand, you want to keep your lane without those changes.", (0, _react2.mdx)("br", {
6583
+ parentName: "p"
6584
+ }), "\n", "this command does the following:"), (0, _react2.mdx)("ol", null, (0, _react2.mdx)("li", {
6585
+ parentName: "ol"
6586
+ }, "create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)"), (0, _react2.mdx)("li", {
6587
+ parentName: "ol"
6588
+ }, "reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.")), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
6589
+ parentName: "table"
6590
+ }, (0, _react2.mdx)("tr", {
6591
+ parentName: "thead"
6592
+ }, (0, _react2.mdx)("th", {
6593
+ parentName: "tr",
6594
+ "align": null
6595
+ }, (0, _react2.mdx)("strong", {
6596
+ parentName: "th"
6597
+ }, "Option")), (0, _react2.mdx)("th", {
6598
+ parentName: "tr",
6599
+ "align": "center"
6600
+ }, (0, _react2.mdx)("strong", {
6601
+ parentName: "th"
6602
+ }, "Option alias")), (0, _react2.mdx)("th", {
6603
+ parentName: "tr",
6604
+ "align": null
6605
+ }, (0, _react2.mdx)("strong", {
6606
+ parentName: "th"
6607
+ }, "Description")))), (0, _react2.mdx)("tbody", {
6608
+ parentName: "table"
6609
+ }, (0, _react2.mdx)("tr", {
6610
+ parentName: "tbody"
6611
+ }, (0, _react2.mdx)("td", {
6612
+ parentName: "tr",
6613
+ "align": null
6614
+ }, (0, _react2.mdx)("inlineCode", {
6615
+ parentName: "td"
6616
+ }, "--scope <scope-name>")), (0, _react2.mdx)("td", {
6617
+ parentName: "tr",
6618
+ "align": "center"
6619
+ }, (0, _react2.mdx)("inlineCode", {
6620
+ parentName: "td"
6621
+ }, "-s")), (0, _react2.mdx)("td", {
6622
+ parentName: "tr",
6623
+ "align": null
6624
+ }, "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")")))), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
6573
6625
  parentName: "table"
6574
6626
  }, (0, _react2.mdx)("tr", {
6575
6627
  parentName: "thead"