@teambit/harmony.content.cli-reference 1.95.53 → 1.95.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -839,6 +839,21 @@
839
839
  "group": "general",
840
840
  "private": false
841
841
  },
842
+ {
843
+ "name": "globals",
844
+ "alias": "",
845
+ "options": [
846
+ [
847
+ "j",
848
+ "json",
849
+ "json format"
850
+ ]
851
+ ],
852
+ "description": "list all globals",
853
+ "extendedDescription": "",
854
+ "group": "workspace",
855
+ "private": false
856
+ },
842
857
  {
843
858
  "name": "show <component-name>",
844
859
  "alias": "",
@@ -975,21 +990,6 @@
975
990
  }
976
991
  ]
977
992
  },
978
- {
979
- "name": "globals",
980
- "alias": "",
981
- "options": [
982
- [
983
- "j",
984
- "json",
985
- "json format"
986
- ]
987
- ],
988
- "description": "list all globals",
989
- "extendedDescription": "",
990
- "group": "workspace",
991
- "private": false
992
- },
993
993
  {
994
994
  "name": "start [type] [pattern]",
995
995
  "alias": "c",
@@ -2245,6 +2245,11 @@
2245
2245
  "build",
2246
2246
  "in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
2247
2247
  ],
2248
+ [
2249
+ "",
2250
+ "verbose",
2251
+ "show details of components that were not merged legitimately"
2252
+ ],
2248
2253
  [
2249
2254
  "",
2250
2255
  "skip-dependency-installation",
@@ -3035,6 +3040,11 @@
3035
3040
  "squash",
3036
3041
  "EXPERIMENTAL. squash multiple snaps. keep the last one only"
3037
3042
  ],
3043
+ [
3044
+ "",
3045
+ "verbose",
3046
+ "show details of components that were not merged legitimately"
3047
+ ],
3038
3048
  [
3039
3049
  "",
3040
3050
  "skip-dependency-installation",
package/cli-reference.mdx CHANGED
@@ -830,6 +830,7 @@ merge changes of different component versions
830
830
  | `--resolve` | | EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes |
831
831
  | `--no-snap` | | EXPERIMENTAL. do not auto snap in case the merge completed without conflicts |
832
832
  | `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
833
+ | `--verbose` | | show details of components that were not merged legitimately |
833
834
  | `--skip-dependency-installation` | | do not install packages of the imported components |
834
835
  | `--message <message>` | `-m` | EXPERIMENTAL. override the default message for the auto snap |
835
836
 
@@ -839,6 +839,21 @@
839
839
  "group": "general",
840
840
  "private": false
841
841
  },
842
+ {
843
+ "name": "globals",
844
+ "alias": "",
845
+ "options": [
846
+ [
847
+ "j",
848
+ "json",
849
+ "json format"
850
+ ]
851
+ ],
852
+ "description": "list all globals",
853
+ "extendedDescription": "",
854
+ "group": "workspace",
855
+ "private": false
856
+ },
842
857
  {
843
858
  "name": "show <component-name>",
844
859
  "alias": "",
@@ -975,21 +990,6 @@
975
990
  }
976
991
  ]
977
992
  },
978
- {
979
- "name": "globals",
980
- "alias": "",
981
- "options": [
982
- [
983
- "j",
984
- "json",
985
- "json format"
986
- ]
987
- ],
988
- "description": "list all globals",
989
- "extendedDescription": "",
990
- "group": "workspace",
991
- "private": false
992
- },
993
993
  {
994
994
  "name": "start [type] [pattern]",
995
995
  "alias": "c",
@@ -2245,6 +2245,11 @@
2245
2245
  "build",
2246
2246
  "in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
2247
2247
  ],
2248
+ [
2249
+ "",
2250
+ "verbose",
2251
+ "show details of components that were not merged legitimately"
2252
+ ],
2248
2253
  [
2249
2254
  "",
2250
2255
  "skip-dependency-installation",
@@ -3035,6 +3040,11 @@
3035
3040
  "squash",
3036
3041
  "EXPERIMENTAL. squash multiple snaps. keep the last one only"
3037
3042
  ],
3043
+ [
3044
+ "",
3045
+ "verbose",
3046
+ "show details of components that were not merged legitimately"
3047
+ ],
3038
3048
  [
3039
3049
  "",
3040
3050
  "skip-dependency-installation",
@@ -3796,6 +3796,19 @@ function MDXContent(_ref) {
3796
3796
  "align": null
3797
3797
  }, (0, _react2.mdx)("inlineCode", {
3798
3798
  parentName: "td"
3799
+ }, "--verbose")), (0, _react2.mdx)("td", {
3800
+ parentName: "tr",
3801
+ "align": "center"
3802
+ }), (0, _react2.mdx)("td", {
3803
+ parentName: "tr",
3804
+ "align": null
3805
+ }, "show details of components that were not merged legitimately")), (0, _react2.mdx)("tr", {
3806
+ parentName: "tbody"
3807
+ }, (0, _react2.mdx)("td", {
3808
+ parentName: "tr",
3809
+ "align": null
3810
+ }, (0, _react2.mdx)("inlineCode", {
3811
+ parentName: "td"
3799
3812
  }, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
3800
3813
  parentName: "tr",
3801
3814
  "align": "center"