@teambit/harmony.content.cli-reference 1.95.179 → 1.95.180

package/cli-reference.docs.mdx

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

package/cli-reference.json

@@ -2844,7 +2844,7 @@
       ]
     ],
     "description": "merge changes of the remote head into local",
-    "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)",
+    "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. to revert a lane merge, use \"bit lane merge-abort\" command.\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
   },
@@ -3287,6 +3287,31 @@
             "description": "partially merge the lane with the specified component-pattern"
           }
         ]
+      },
+      {
+        "name": "merge-abort",
+        "alias": "",
+        "options": [
+          [
+            "",
+            "verbose",
+            "show details of components that were not merged legitimately"
+          ],
+          [
+            "s",
+            "silent",
+            "skip confirmation"
+          ],
+          [
+            "x",
+            "skip-dependency-installation",
+            "do not install packages of the imported components"
+          ]
+        ],
+        "description": "abort the recent lane-merge. revert the lane object and checkout accordingly",
+        "extendedDescription": "restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane",
+        "private": true,
+        "remoteOp": true
       }
     ]
   },

package/cli-reference.mdx

@@ -957,6 +957,20 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
 | `--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" |
 
+### lane merge-abort
+
+**Usage**: `lane merge-abort`
+
+**Description**: abort the recent lane-merge. revert the lane object and checkout accordingly  
+restore the lane-object same as it was before the last "bit lane merge" command.  
+also, checkout the workspace components according to the restored lane
+
+| **Option**                       | **Option alias** | **Description**                                              |
+| -------------------------------- | :--------------: | ------------------------------------------------------------ |
+| `--verbose`                      |                  | show details of components that were not merged legitimately |
+| `--silent`                       |       `-s`       | skip confirmation                                            |
+| `--skip-dependency-installation` |       `-x`       | do not install packages of the imported components           |
+
 | **Option**          | **Option alias** | **Description**                                               |
 | ------------------- | :--------------: | ------------------------------------------------------------- |
 | `--details`         |       `-d`       | show more details on the state of each component in each lane |
@@ -1073,7 +1087,7 @@ https://bit.dev/docs/reference/cli-reference#list
 **Description**: merge changes of the remote head into local  
 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.  
+optionally use '--abort' to revert the last merge. to revert a lane merge, use "bit lane merge-abort" command.  
 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.docs.mdx

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

package/dist/cli-reference.json

@@ -2844,7 +2844,7 @@
             ]
         ],
         "description": "merge changes of the remote head into local",
-        "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)",
+        "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. to revert a lane merge, use \"bit lane merge-abort\" command.\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
     },
@@ -3287,6 +3287,31 @@
                         "description": "partially merge the lane with the specified component-pattern"
                     }
                 ]
+            },
+            {
+                "name": "merge-abort",
+                "alias": "",
+                "options": [
+                    [
+                        "",
+                        "verbose",
+                        "show details of components that were not merged legitimately"
+                    ],
+                    [
+                        "s",
+                        "silent",
+                        "skip confirmation"
+                    ],
+                    [
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install packages of the imported components"
+                    ]
+                ],
+                "description": "abort the recent lane-merge. revert the lane object and checkout accordingly",
+                "extendedDescription": "restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane",
+                "private": true,
+                "remoteOp": true
             }
         ]
     },

package/dist/cli-reference.mdx.js

@@ -4435,7 +4435,81 @@ 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)("table", null, (0, _react2.mdx)("thead", {
+  }, "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", {
+    parentName: "p"
+  }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
+    parentName: "p"
+  }, "lane merge-abort")), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+    parentName: "p"
+  }, "Description"), ": abort the recent lane-merge. revert the lane object and checkout accordingly", (0, _react2.mdx)("br", {
+    parentName: "p"
+  }), "\n", "restore the lane-object same as it was before the last \"bit lane merge\" command.", (0, _react2.mdx)("br", {
+    parentName: "p"
+  }), "\n", "also, checkout the workspace components according to the restored lane"), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
+    parentName: "table"
+  }, (0, _react2.mdx)("tr", {
+    parentName: "thead"
+  }, (0, _react2.mdx)("th", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("strong", {
+    parentName: "th"
+  }, "Option")), (0, _react2.mdx)("th", {
+    parentName: "tr",
+    "align": "center"
+  }, (0, _react2.mdx)("strong", {
+    parentName: "th"
+  }, "Option alias")), (0, _react2.mdx)("th", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("strong", {
+    parentName: "th"
+  }, "Description")))), (0, _react2.mdx)("tbody", {
+    parentName: "table"
+  }, (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "--verbose")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "show details of components that were not merged legitimately")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "--silent")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "-s")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "skip confirmation")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "-x")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "do not install packages of the imported components")))), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
     parentName: "table"
   }, (0, _react2.mdx)("tr", {
     parentName: "thead"
@@ -5060,7 +5134,7 @@ function MDXContent(_ref) {
     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", {
+  }), "\n", "optionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.", (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"