@teambit/harmony.content.cli-reference 1.95.194 → 1.95.195

package/cli-reference.docs.mdx

@@ -1,5 +1,5 @@
 ---
-description: 'Bit command synopses. Bit version: 0.2.18'
+description: 'Bit command synopses. Bit version: 0.2.19'
 labels: ['cli', 'mdx', 'docs']
 ---
       

package/cli-reference.json

@@ -3348,6 +3348,11 @@
             "",
             "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\""
+          ],
+          [
+            "",
+            "include-non-lane-comps",
+            "when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
           ]
         ],
         "description": "merge a local or a remote lane",

package/cli-reference.mdx

@@ -1134,6 +1134,7 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
 | `--skip-fetch`                         |                  | use the current target-lane if exits locally without updating it from the remote                                                        |
 | `--include-deps`                       |                  | relevant for "--pattern" and "--workspace". merge also dependencies of the given components                                             |
 | `--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" |
+| `--include-non-lane-comps`             |                  | when merging main, include workspace components that are not on the lane (by default only lane components are merged)                   |
 
 ### lane merge-abort
 

package/dist/cli-reference.docs.mdx

@@ -1,5 +1,5 @@
 ---
-description: 'Bit command synopses. Bit version: 0.2.18'
+description: 'Bit command synopses. Bit version: 0.2.19'
 labels: ['cli', 'mdx', 'docs']
 ---
       

package/dist/cli-reference.json

@@ -3348,6 +3348,11 @@
                         "",
                         "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\""
+                    ],
+                    [
+                        "",
+                        "include-non-lane-comps",
+                        "when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
                     ]
                 ],
                 "description": "merge a local or a remote lane",

package/dist/cli-reference.mdx.js

@@ -5628,7 +5628,20 @@ function MDXContent(_ref) {
   }), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": null
-  }, "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"")))), (0, _react2.mdx)("h3", null, "lane merge-abort"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+  }, "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "--include-non-lane-comps")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "when merging main, include workspace components that are not on the lane (by default only lane components are merged)")))), (0, _react2.mdx)("h3", null, "lane merge-abort"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
     parentName: "p"
   }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
     parentName: "p"