@teambit/harmony.content.cli-reference 2.0.344 → 2.0.346
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.docs.mdx +1 -1
- package/cli-reference.json +20 -0
- package/cli-reference.mdx +2 -0
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +20 -0
- package/dist/cli-reference.mdx.js +26 -0
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1721223204715.js → preview-1721272773287.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -3706,6 +3706,16 @@
|
|
|
3706
3706
|
"auto-merge-resolve <merge-strategy>",
|
|
3707
3707
|
"merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
|
|
3708
3708
|
],
|
|
3709
|
+
[
|
|
3710
|
+
"",
|
|
3711
|
+
"force-ours",
|
|
3712
|
+
"do not merge, preserve local files as is"
|
|
3713
|
+
],
|
|
3714
|
+
[
|
|
3715
|
+
"",
|
|
3716
|
+
"force-theirs",
|
|
3717
|
+
"do not merge, just overwrite with incoming files"
|
|
3718
|
+
],
|
|
3709
3719
|
[
|
|
3710
3720
|
"a",
|
|
3711
3721
|
"get-all",
|
|
@@ -4190,6 +4200,16 @@
|
|
|
4190
4200
|
"auto-merge-resolve <merge-strategy>",
|
|
4191
4201
|
"merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
|
|
4192
4202
|
],
|
|
4203
|
+
[
|
|
4204
|
+
"",
|
|
4205
|
+
"force-ours",
|
|
4206
|
+
"do not merge, preserve local files as is"
|
|
4207
|
+
],
|
|
4208
|
+
[
|
|
4209
|
+
"",
|
|
4210
|
+
"force-theirs",
|
|
4211
|
+
"do not merge, just overwrite with incoming files"
|
|
4212
|
+
],
|
|
4193
4213
|
[
|
|
4194
4214
|
"a",
|
|
4195
4215
|
"get-all",
|
package/cli-reference.mdx
CHANGED
|
@@ -1035,6 +1035,8 @@ when no package is specified, all workspace dependencies are installed and all w
|
|
|
1035
1035
|
| --------------------------------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
1036
1036
|
| `--head` | `-h` | switch to the head of the lane/main (fetches the latest changes from the remote) |
|
|
1037
1037
|
| `--auto-merge-resolve <merge-strategy>` | `-r` | merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual" |
|
|
1038
|
+
| `--force-ours` | | do not merge, preserve local files as is |
|
|
1039
|
+
| `--force-theirs` | | do not merge, just overwrite with incoming files |
|
|
1038
1040
|
| `--get-all` | `-a` | DEPRECATED. this is currently the default behavior |
|
|
1039
1041
|
| `--workspace-only` | | checkout only the components in the workspace to the selected lane |
|
|
1040
1042
|
| `--skip-dependency-installation` | `-x` | do not install dependencies of the imported components |
|
package/dist/cli-reference.json
CHANGED
|
@@ -3706,6 +3706,16 @@
|
|
|
3706
3706
|
"auto-merge-resolve <merge-strategy>",
|
|
3707
3707
|
"merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
|
|
3708
3708
|
],
|
|
3709
|
+
[
|
|
3710
|
+
"",
|
|
3711
|
+
"force-ours",
|
|
3712
|
+
"do not merge, preserve local files as is"
|
|
3713
|
+
],
|
|
3714
|
+
[
|
|
3715
|
+
"",
|
|
3716
|
+
"force-theirs",
|
|
3717
|
+
"do not merge, just overwrite with incoming files"
|
|
3718
|
+
],
|
|
3709
3719
|
[
|
|
3710
3720
|
"a",
|
|
3711
3721
|
"get-all",
|
|
@@ -4190,6 +4200,16 @@
|
|
|
4190
4200
|
"auto-merge-resolve <merge-strategy>",
|
|
4191
4201
|
"merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
|
|
4192
4202
|
],
|
|
4203
|
+
[
|
|
4204
|
+
"",
|
|
4205
|
+
"force-ours",
|
|
4206
|
+
"do not merge, preserve local files as is"
|
|
4207
|
+
],
|
|
4208
|
+
[
|
|
4209
|
+
"",
|
|
4210
|
+
"force-theirs",
|
|
4211
|
+
"do not merge, just overwrite with incoming files"
|
|
4212
|
+
],
|
|
4193
4213
|
[
|
|
4194
4214
|
"a",
|
|
4195
4215
|
"get-all",
|
|
@@ -5400,6 +5400,32 @@ function MDXContent(_ref) {
|
|
|
5400
5400
|
"align": null
|
|
5401
5401
|
}, (0, _react2.mdx)("inlineCode", {
|
|
5402
5402
|
parentName: "td"
|
|
5403
|
+
}, "--force-ours")), (0, _react2.mdx)("td", {
|
|
5404
|
+
parentName: "tr",
|
|
5405
|
+
"align": "center"
|
|
5406
|
+
}), (0, _react2.mdx)("td", {
|
|
5407
|
+
parentName: "tr",
|
|
5408
|
+
"align": null
|
|
5409
|
+
}, "do not merge, preserve local files as is")), (0, _react2.mdx)("tr", {
|
|
5410
|
+
parentName: "tbody"
|
|
5411
|
+
}, (0, _react2.mdx)("td", {
|
|
5412
|
+
parentName: "tr",
|
|
5413
|
+
"align": null
|
|
5414
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
5415
|
+
parentName: "td"
|
|
5416
|
+
}, "--force-theirs")), (0, _react2.mdx)("td", {
|
|
5417
|
+
parentName: "tr",
|
|
5418
|
+
"align": "center"
|
|
5419
|
+
}), (0, _react2.mdx)("td", {
|
|
5420
|
+
parentName: "tr",
|
|
5421
|
+
"align": null
|
|
5422
|
+
}, "do not merge, just overwrite with incoming files")), (0, _react2.mdx)("tr", {
|
|
5423
|
+
parentName: "tbody"
|
|
5424
|
+
}, (0, _react2.mdx)("td", {
|
|
5425
|
+
parentName: "tr",
|
|
5426
|
+
"align": null
|
|
5427
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
5428
|
+
parentName: "td"
|
|
5403
5429
|
}, "--get-all")), (0, _react2.mdx)("td", {
|
|
5404
5430
|
parentName: "tr",
|
|
5405
5431
|
"align": "center"
|