@teambit/harmony.content.cli-reference 1.95.102 → 1.95.104

package/cli-reference.json

@@ -2805,9 +2805,14 @@
     "private": true
   },
   {
-    "name": "_merge-lane <lane> [pattern]",
+    "name": "_merge-lane <from-lane> [to-lane]",
     "alias": "",
     "options": [
+      [
+        "",
+        "pattern <string>",
+        "partially merge the lane with the specified component-pattern"
+      ],
       [
         "",
         "push",
@@ -2834,19 +2839,19 @@
         "output as json format"
       ]
     ],
-    "description": "merge a remote lane into main via a bare-scope (not workspace)",
-    "extendedDescription": "to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command",
+    "description": "merge a remote lane into another lane or main via a bare-scope (not workspace)",
+    "extendedDescription": "to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command",
     "group": "ungrouped",
     "private": true,
     "remoteOp": true,
     "arguments": [
       {
-        "name": "lane",
-        "description": "lane-id to merge to main"
+        "name": "from-lane",
+        "description": "lane-id to merge from"
       },
       {
-        "name": "pattern",
-        "description": "EXPERIMENTAL. partially merge the lane with the specified component-pattern"
+        "name": "to-lane",
+        "description": "lane-id to merge to. default is \"main\""
       }
     ]
   },
@@ -3094,6 +3099,11 @@
         "verbose",
         "show extra data: full snap hashes for staged, divergence point for lanes and updates-from-main for forked lanes"
       ],
+      [
+        "l",
+        "lanes",
+        "when on a lane, show updates from main and updates from forked lanes"
+      ],
       [
         "",
         "strict",

package/cli-reference.mdx

@@ -1143,6 +1143,7 @@ use `bit pattern --help` to understand patterns better and `bit pattern <pattern
 | ----------- | :--------------: | --------------------------------------------------------------------------------------------------------------- |
 | `--json`    |       `-j`       | return a json version of the component                                                                          |
 | `--verbose` |                  | show extra data: full snap hashes for staged, divergence point for lanes and updates-from-main for forked lanes |
+| `--lanes`   |       `-l`       | when on a lane, show updates from main and updates from forked lanes                                            |
 | `--strict`  |                  | in case issues found, exit with code 1                                                                          |
 
 ---

package/dist/cli-reference.json

@@ -2805,9 +2805,14 @@
         "private": true
     },
     {
-        "name": "_merge-lane <lane> [pattern]",
+        "name": "_merge-lane <from-lane> [to-lane]",
         "alias": "",
         "options": [
+            [
+                "",
+                "pattern <string>",
+                "partially merge the lane with the specified component-pattern"
+            ],
             [
                 "",
                 "push",
@@ -2834,19 +2839,19 @@
                 "output as json format"
             ]
         ],
-        "description": "merge a remote lane into main via a bare-scope (not workspace)",
-        "extendedDescription": "to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command",
+        "description": "merge a remote lane into another lane or main via a bare-scope (not workspace)",
+        "extendedDescription": "to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command",
         "group": "ungrouped",
         "private": true,
         "remoteOp": true,
         "arguments": [
             {
-                "name": "lane",
-                "description": "lane-id to merge to main"
+                "name": "from-lane",
+                "description": "lane-id to merge from"
             },
             {
-                "name": "pattern",
-                "description": "EXPERIMENTAL. partially merge the lane with the specified component-pattern"
+                "name": "to-lane",
+                "description": "lane-id to merge to. default is \"main\""
             }
         ]
     },
@@ -3094,6 +3099,11 @@
                 "verbose",
                 "show extra data: full snap hashes for staged, divergence point for lanes and updates-from-main for forked lanes"
             ],
+            [
+                "l",
+                "lanes",
+                "when on a lane, show updates from main and updates from forked lanes"
+            ],
             [
                 "",
                 "strict",

package/dist/cli-reference.mdx.js

@@ -5126,6 +5126,21 @@ function MDXContent(_ref) {
     "align": null
   }, (0, _react2.mdx)("inlineCode", {
     parentName: "td"
+  }, "--lanes")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "-l")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "when on a lane, show updates from main and updates from forked lanes")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
   }, "--strict")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": "center"