@teambit/harmony.content.cli-reference 1.95.52 → 1.95.53
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.
- package/cli-reference.json +10 -0
- package/cli-reference.mdx +11 -10
- package/dist/cli-reference.json +10 -0
- package/dist/cli-reference.mdx.js +13 -0
- package/dist/cli-reference.mdx.js.map +1 -1
- package/package-tar/teambit-harmony.content.cli-reference-1.95.53.tgz +0 -0
- package/package.json +2 -2
- package/{preview-1660015726089.js → preview-1660102118004.js} +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.52.tgz +0 -0
package/cli-reference.json
CHANGED
|
@@ -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
|
+
"skip-dependency-installation",
|
|
2251
|
+
"do not install packages of the imported components"
|
|
2252
|
+
],
|
|
2248
2253
|
[
|
|
2249
2254
|
"m",
|
|
2250
2255
|
"message <message>",
|
|
@@ -3030,6 +3035,11 @@
|
|
|
3030
3035
|
"squash",
|
|
3031
3036
|
"EXPERIMENTAL. squash multiple snaps. keep the last one only"
|
|
3032
3037
|
],
|
|
3038
|
+
[
|
|
3039
|
+
"",
|
|
3040
|
+
"skip-dependency-installation",
|
|
3041
|
+
"do not install packages of the imported components"
|
|
3042
|
+
],
|
|
3033
3043
|
[
|
|
3034
3044
|
"",
|
|
3035
3045
|
"include-deps",
|
package/cli-reference.mdx
CHANGED
|
@@ -821,16 +821,17 @@ merge changes of different component versions
|
|
|
821
821
|
|
|
822
822
|
`bit merge [values...]`
|
|
823
823
|
|
|
824
|
-
| **Option**
|
|
825
|
-
|
|
|
826
|
-
| `--ours`
|
|
827
|
-
| `--theirs`
|
|
828
|
-
| `--manual`
|
|
829
|
-
| `--abort`
|
|
830
|
-
| `--resolve`
|
|
831
|
-
| `--no-snap`
|
|
832
|
-
| `--build`
|
|
833
|
-
| `--
|
|
824
|
+
| **Option** | **Option alias** | **Description** |
|
|
825
|
+
| -------------------------------- | :--------------: | ------------------------------------------------------------------------------------------- |
|
|
826
|
+
| `--ours` | | in case of a conflict, override the used version with the current modification |
|
|
827
|
+
| `--theirs` | | in case of a conflict, override the current modification with the specified version |
|
|
828
|
+
| `--manual` | | in case of a conflict, leave the files with a conflict state to resolve them manually later |
|
|
829
|
+
| `--abort` | | EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began |
|
|
830
|
+
| `--resolve` | | EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes |
|
|
831
|
+
| `--no-snap` | | EXPERIMENTAL. do not auto snap in case the merge completed without conflicts |
|
|
832
|
+
| `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
|
|
833
|
+
| `--skip-dependency-installation` | | do not install packages of the imported components |
|
|
834
|
+
| `--message <message>` | `-m` | EXPERIMENTAL. override the default message for the auto snap |
|
|
834
835
|
|
|
835
836
|
---
|
|
836
837
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -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
|
+
"skip-dependency-installation",
|
|
2251
|
+
"do not install packages of the imported components"
|
|
2252
|
+
],
|
|
2248
2253
|
[
|
|
2249
2254
|
"m",
|
|
2250
2255
|
"message <message>",
|
|
@@ -3030,6 +3035,11 @@
|
|
|
3030
3035
|
"squash",
|
|
3031
3036
|
"EXPERIMENTAL. squash multiple snaps. keep the last one only"
|
|
3032
3037
|
],
|
|
3038
|
+
[
|
|
3039
|
+
"",
|
|
3040
|
+
"skip-dependency-installation",
|
|
3041
|
+
"do not install packages of the imported components"
|
|
3042
|
+
],
|
|
3033
3043
|
[
|
|
3034
3044
|
"",
|
|
3035
3045
|
"include-deps",
|
|
@@ -3796,6 +3796,19 @@ function MDXContent(_ref) {
|
|
|
3796
3796
|
"align": null
|
|
3797
3797
|
}, (0, _react2.mdx)("inlineCode", {
|
|
3798
3798
|
parentName: "td"
|
|
3799
|
+
}, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
|
|
3800
|
+
parentName: "tr",
|
|
3801
|
+
"align": "center"
|
|
3802
|
+
}), (0, _react2.mdx)("td", {
|
|
3803
|
+
parentName: "tr",
|
|
3804
|
+
"align": null
|
|
3805
|
+
}, "do not install packages of the imported components")), (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
|
}, "--message <message>")), (0, _react2.mdx)("td", {
|
|
3800
3813
|
parentName: "tr",
|
|
3801
3814
|
"align": "center"
|