@teambit/harmony.content.cli-reference 1.95.147 → 1.95.148

package/cli-reference.json

@@ -2672,7 +2672,7 @@
       ]
     ],
     "description": "merge changes of the remote head into local",
-    "extendedDescription": "merge changes of the remote head into local, optionally use '--abort' or '--resolve\nyou can use a pattern for multiple ids, such as bit merge \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
+    "extendedDescription": "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge/lane-merge.\nyou can use a pattern for multiple ids, such as bit merge \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
     "group": "development",
     "private": false
   },

package/cli-reference.mdx

@@ -1020,7 +1020,9 @@ https://bit.dev/docs/reference/cli-reference#list
 ## merge
 
 **Description**: merge changes of the remote head into local  
-merge changes of the remote head into local, optionally use '--abort' or '--resolve  
+merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.  
+if no ids are specified, all pending-merge components will be merged. (run "bit status" to list them).  
+optionally use '--abort' to revert the last merge/lane-merge.  
 you can use a pattern for multiple ids, such as bit merge "utils/\*". (wrap the pattern with quotes to avoid collision with shell commands)
 
 `bit merge [ids...]`

package/dist/cli-reference.json

@@ -2672,7 +2672,7 @@
             ]
         ],
         "description": "merge changes of the remote head into local",
-        "extendedDescription": "merge changes of the remote head into local, optionally use '--abort' or '--resolve\nyou can use a pattern for multiple ids, such as bit merge \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
+        "extendedDescription": "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge/lane-merge.\nyou can use a pattern for multiple ids, such as bit merge \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
         "group": "development",
         "private": false
     },

package/dist/cli-reference.mdx.js

@@ -4799,7 +4799,11 @@ function MDXContent(_ref) {
     parentName: "p"
   }, "Description"), ": merge changes of the remote head into local", (0, _react2.mdx)("br", {
     parentName: "p"
-  }), "\n", "merge changes of the remote head into local, optionally use '--abort' or '--resolve", (0, _react2.mdx)("br", {
+  }), "\n", "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.", (0, _react2.mdx)("br", {
+    parentName: "p"
+  }), "\n", "if no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).", (0, _react2.mdx)("br", {
+    parentName: "p"
+  }), "\n", "optionally use '--abort' to revert the last merge/lane-merge.", (0, _react2.mdx)("br", {
     parentName: "p"
   }), "\n", "you can use a pattern for multiple ids, such as bit merge \"utils/", "*", "\". (wrap the pattern with quotes to avoid collision with shell commands)"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
     parentName: "p"