@teambit/harmony.content.cli-reference 2.0.397 → 2.0.398

package/cli-reference.docs.mdx

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

package/cli-reference.json

@@ -1263,6 +1263,45 @@
     "group": "development",
     "private": false
   },
+  {
+    "name": "deprecate <component-name>",
+    "alias": "d",
+    "options": [
+      [
+        "",
+        "new-id <string>",
+        "if replaced by another component, enter the new component id. alternatively use \"bit rename --deprecate\" to do this automatically"
+      ],
+      [
+        "",
+        "range <string>",
+        "enter a Semver range to deprecate specific versions. see https://www.npmjs.com/package/semver#ranges for the range syntax"
+      ]
+    ],
+    "description": "deprecate a component",
+    "extendedDescription": "",
+    "group": "collaborate",
+    "private": false,
+    "remoteOp": true,
+    "skipWorkspace": true,
+    "arguments": [
+      {
+        "name": "component-name",
+        "description": "component name or component id"
+      }
+    ]
+  },
+  {
+    "name": "undeprecate <id>",
+    "alias": "",
+    "options": [],
+    "description": "undeprecate a deprecated component (local/remote)",
+    "extendedDescription": "",
+    "group": "collaborate",
+    "private": false,
+    "remoteOp": true,
+    "skipWorkspace": true
+  },
   {
     "name": "ws-config <sub-command>",
     "alias": "workspace-config",
@@ -3396,45 +3435,6 @@
       }
     ]
   },
-  {
-    "name": "deprecate <component-name>",
-    "alias": "d",
-    "options": [
-      [
-        "",
-        "new-id <string>",
-        "if replaced by another component, enter the new component id. alternatively use \"bit rename --deprecate\" to do this automatically"
-      ],
-      [
-        "",
-        "range <string>",
-        "enter a Semver range to deprecate specific versions. see https://www.npmjs.com/package/semver#ranges for the range syntax"
-      ]
-    ],
-    "description": "deprecate a component",
-    "extendedDescription": "",
-    "group": "collaborate",
-    "private": false,
-    "remoteOp": true,
-    "skipWorkspace": true,
-    "arguments": [
-      {
-        "name": "component-name",
-        "description": "component name or component id"
-      }
-    ]
-  },
-  {
-    "name": "undeprecate <id>",
-    "alias": "",
-    "options": [],
-    "description": "undeprecate a deprecated component (local/remote)",
-    "extendedDescription": "",
-    "group": "collaborate",
-    "private": false,
-    "remoteOp": true,
-    "skipWorkspace": true
-  },
   {
     "name": "test [component-pattern]",
     "alias": "at",
@@ -4108,10 +4108,15 @@
             "workspace",
             "merge only lane components that are in the current workspace"
           ],
+          [
+            "",
+            "no-auto-snap",
+            "do not auto snap after merge completed without conflicts of diverged components (see command description)"
+          ],
           [
             "",
             "no-snap",
-            "do not auto snap after merge completed without conflicts"
+            "do not pass snaps from the other lane even for non-diverged components (see command description)"
           ],
           [
             "",
@@ -4185,7 +4190,7 @@
           ]
         ],
         "description": "merge a local or a remote lane to the current lane",
-        "extendedDescription": "by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n",
+        "extendedDescription": "by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n",
         "private": true,
         "remoteOp": true,
         "arguments": [

package/cli-reference.mdx

@@ -1206,7 +1206,11 @@ by default, the provided lane will be fetched from the remote before merging.
 to merge the lane from the local scope without updating it first, use "--skip-fetch" flag.
 
 when the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,  
-these components will be snap-merged to complete the merge. use "no-snap" to opt-out, or "tag" to tag instead.
+these components will be snap-merged to complete the merge. use "no-auto-snap" to opt-out, or "tag" to tag instead.
+
+when the components are not diverged in history, and the current lane is behind the merge candidate, the merge will  
+simply update the components and the heads according to the merge candidate.  
+to opt-out, use "--no-snap", the components will be written as the merge candidate, and will be left as modified.
 
 in case a component in both ends don't share history (no snap is found in common), the merge will require "--resolve-unrelated" flag.  
 this flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:
@@ -1230,7 +1234,8 @@ this flag keeps the history of one end and saves a reference to the other end. t
 | `--ours`                                |                  | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications                                                                       |
 | `--theirs`                              |                  | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes                                                           |
 | `--workspace`                           |                  | merge only lane components that are in the current workspace                                                                                                |
-| `--no-snap`                             |                  | do not auto snap after merge completed without conflicts                                                                                                    |
+| `--no-auto-snap`                        |                  | do not auto snap after merge completed without conflicts of diverged components (see command description)                                                   |
+| `--no-snap`                             |                  | do not pass snaps from the other lane even for non-diverged components (see command description)                                                            |
 | `--tag`                                 |                  | auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)                                                                   |
 | `--build`                               |                  | in case of snap during the merge, run the build-pipeline (similar to bit snap --build)                                                                      |
 | `--message <message>`                   |       `-m`       | override the default message for the auto snap                                                                                                              |

package/dist/cli-reference.docs.mdx

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

package/dist/cli-reference.json

@@ -1263,6 +1263,45 @@
         "group": "development",
         "private": false
     },
+    {
+        "name": "deprecate <component-name>",
+        "alias": "d",
+        "options": [
+            [
+                "",
+                "new-id <string>",
+                "if replaced by another component, enter the new component id. alternatively use \"bit rename --deprecate\" to do this automatically"
+            ],
+            [
+                "",
+                "range <string>",
+                "enter a Semver range to deprecate specific versions. see https://www.npmjs.com/package/semver#ranges for the range syntax"
+            ]
+        ],
+        "description": "deprecate a component",
+        "extendedDescription": "",
+        "group": "collaborate",
+        "private": false,
+        "remoteOp": true,
+        "skipWorkspace": true,
+        "arguments": [
+            {
+                "name": "component-name",
+                "description": "component name or component id"
+            }
+        ]
+    },
+    {
+        "name": "undeprecate <id>",
+        "alias": "",
+        "options": [],
+        "description": "undeprecate a deprecated component (local/remote)",
+        "extendedDescription": "",
+        "group": "collaborate",
+        "private": false,
+        "remoteOp": true,
+        "skipWorkspace": true
+    },
     {
         "name": "ws-config <sub-command>",
         "alias": "workspace-config",
@@ -3396,45 +3435,6 @@
             }
         ]
     },
-    {
-        "name": "deprecate <component-name>",
-        "alias": "d",
-        "options": [
-            [
-                "",
-                "new-id <string>",
-                "if replaced by another component, enter the new component id. alternatively use \"bit rename --deprecate\" to do this automatically"
-            ],
-            [
-                "",
-                "range <string>",
-                "enter a Semver range to deprecate specific versions. see https://www.npmjs.com/package/semver#ranges for the range syntax"
-            ]
-        ],
-        "description": "deprecate a component",
-        "extendedDescription": "",
-        "group": "collaborate",
-        "private": false,
-        "remoteOp": true,
-        "skipWorkspace": true,
-        "arguments": [
-            {
-                "name": "component-name",
-                "description": "component name or component id"
-            }
-        ]
-    },
-    {
-        "name": "undeprecate <id>",
-        "alias": "",
-        "options": [],
-        "description": "undeprecate a deprecated component (local/remote)",
-        "extendedDescription": "",
-        "group": "collaborate",
-        "private": false,
-        "remoteOp": true,
-        "skipWorkspace": true
-    },
     {
         "name": "test [component-pattern]",
         "alias": "at",
@@ -4108,10 +4108,15 @@
                         "workspace",
                         "merge only lane components that are in the current workspace"
                     ],
+                    [
+                        "",
+                        "no-auto-snap",
+                        "do not auto snap after merge completed without conflicts of diverged components (see command description)"
+                    ],
                     [
                         "",
                         "no-snap",
-                        "do not auto snap after merge completed without conflicts"
+                        "do not pass snaps from the other lane even for non-diverged components (see command description)"
                     ],
                     [
                         "",
@@ -4185,7 +4190,7 @@
                     ]
                 ],
                 "description": "merge a local or a remote lane to the current lane",
-                "extendedDescription": "by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n",
+                "extendedDescription": "by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n",
                 "private": true,
                 "remoteOp": true,
                 "arguments": [

package/dist/cli-reference.mdx.js

@@ -6231,7 +6231,11 @@ function MDXContent(_ref) {
     parentName: "p"
   }), "\n", "to merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag."), (0, _react2.mdx)("p", null, "when the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,", (0, _react2.mdx)("br", {
     parentName: "p"
-  }), "\n", "these components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead."), (0, _react2.mdx)("p", null, "in case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.", (0, _react2.mdx)("br", {
+  }), "\n", "these components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead."), (0, _react2.mdx)("p", null, "when the components are not diverged in history, and the current lane is behind the merge candidate, the merge will", (0, _react2.mdx)("br", {
+    parentName: "p"
+  }), "\n", "simply update the components and the heads according to the merge candidate.", (0, _react2.mdx)("br", {
+    parentName: "p"
+  }), "\n", "to opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified."), (0, _react2.mdx)("p", null, "in case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.", (0, _react2.mdx)("br", {
     parentName: "p"
   }), "\n", "this flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:"), (0, _react2.mdx)("ol", null, (0, _react2.mdx)("li", {
     parentName: "ol"
@@ -6380,13 +6384,26 @@ function MDXContent(_ref) {
     "align": null
   }, (0, _react2.mdx)("inlineCode", {
     parentName: "td"
+  }, "--no-auto-snap")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "do not auto snap after merge completed without conflicts of diverged components (see command description)")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
   }, "--no-snap")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": "center"
   }), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": null
-  }, "do not auto snap after merge completed without conflicts")), (0, _react2.mdx)("tr", {
+  }, "do not pass snaps from the other lane even for non-diverged components (see command description)")), (0, _react2.mdx)("tr", {
     parentName: "tbody"
   }, (0, _react2.mdx)("td", {
     parentName: "tr",