@teambit/harmony.content.cli-reference 2.0.144 → 2.0.146
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 +29 -24
- package/cli-reference.mdx +4 -3
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +29 -24
- package/dist/cli-reference.mdx.js +22 -9
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1705406853442.js → preview-1705577037962.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -660,21 +660,6 @@
|
|
|
660
660
|
}
|
|
661
661
|
]
|
|
662
662
|
},
|
|
663
|
-
{
|
|
664
|
-
"name": "component-issues",
|
|
665
|
-
"alias": "",
|
|
666
|
-
"options": [
|
|
667
|
-
[
|
|
668
|
-
"j",
|
|
669
|
-
"json",
|
|
670
|
-
"output issues in json format"
|
|
671
|
-
]
|
|
672
|
-
],
|
|
673
|
-
"description": "list available component-issues",
|
|
674
|
-
"extendedDescription": "",
|
|
675
|
-
"group": "development",
|
|
676
|
-
"private": true
|
|
677
|
-
},
|
|
678
663
|
{
|
|
679
664
|
"name": "show <component-name>",
|
|
680
665
|
"alias": "",
|
|
@@ -711,6 +696,21 @@
|
|
|
711
696
|
}
|
|
712
697
|
]
|
|
713
698
|
},
|
|
699
|
+
{
|
|
700
|
+
"name": "component-issues",
|
|
701
|
+
"alias": "",
|
|
702
|
+
"options": [
|
|
703
|
+
[
|
|
704
|
+
"j",
|
|
705
|
+
"json",
|
|
706
|
+
"output issues in json format"
|
|
707
|
+
]
|
|
708
|
+
],
|
|
709
|
+
"description": "list available component-issues",
|
|
710
|
+
"extendedDescription": "",
|
|
711
|
+
"group": "development",
|
|
712
|
+
"private": true
|
|
713
|
+
},
|
|
714
714
|
{
|
|
715
715
|
"name": "envs",
|
|
716
716
|
"alias": "env",
|
|
@@ -3147,6 +3147,11 @@
|
|
|
3147
3147
|
"auto-merge-resolve <merge-strategy>",
|
|
3148
3148
|
"in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
3149
3149
|
],
|
|
3150
|
+
[
|
|
3151
|
+
"",
|
|
3152
|
+
"manual",
|
|
3153
|
+
"same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
|
|
3154
|
+
],
|
|
3150
3155
|
[
|
|
3151
3156
|
"a",
|
|
3152
3157
|
"all",
|
|
@@ -3467,7 +3472,7 @@
|
|
|
3467
3472
|
[
|
|
3468
3473
|
"",
|
|
3469
3474
|
"manual",
|
|
3470
|
-
"
|
|
3475
|
+
"same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
|
|
3471
3476
|
],
|
|
3472
3477
|
[
|
|
3473
3478
|
"",
|
|
@@ -3878,23 +3883,23 @@
|
|
|
3878
3883
|
"options": [
|
|
3879
3884
|
[
|
|
3880
3885
|
"",
|
|
3881
|
-
"
|
|
3882
|
-
"
|
|
3886
|
+
"manual",
|
|
3887
|
+
"same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
|
|
3883
3888
|
],
|
|
3884
3889
|
[
|
|
3885
3890
|
"",
|
|
3886
|
-
"
|
|
3887
|
-
"
|
|
3891
|
+
"auto-merge-resolve <merge-strategy>",
|
|
3892
|
+
"in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
3888
3893
|
],
|
|
3889
3894
|
[
|
|
3890
3895
|
"",
|
|
3891
|
-
"
|
|
3892
|
-
"DEPRECATED. use --auto-merge-resolve"
|
|
3896
|
+
"ours",
|
|
3897
|
+
"DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications"
|
|
3893
3898
|
],
|
|
3894
3899
|
[
|
|
3895
3900
|
"",
|
|
3896
|
-
"
|
|
3897
|
-
"in case of a
|
|
3901
|
+
"theirs",
|
|
3902
|
+
"DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes"
|
|
3898
3903
|
],
|
|
3899
3904
|
[
|
|
3900
3905
|
"",
|
package/cli-reference.mdx
CHANGED
|
@@ -294,6 +294,7 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
|
|
|
294
294
|
| --------------------------------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------------- |
|
|
295
295
|
| `--interactive-merge` | `-i` | when a component is modified and the merge process found conflicts, display options to resolve them |
|
|
296
296
|
| `--auto-merge-resolve <merge-strategy>` | | in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
297
|
+
| `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
|
|
297
298
|
| `--all` | `-a` | all components |
|
|
298
299
|
| `--workspace-only` | `-e` | only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace |
|
|
299
300
|
| `--verbose` | `-v` | showing verbose output for inspection |
|
|
@@ -1180,10 +1181,10 @@ this flag keeps the history of one end and saves a reference to the other end. t
|
|
|
1180
1181
|
|
|
1181
1182
|
| **Option** | **Option alias** | **Description** |
|
|
1182
1183
|
| --------------------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
1184
|
+
| `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
|
|
1185
|
+
| `--auto-merge-resolve <merge-strategy>` | | in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
1183
1186
|
| `--ours` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications |
|
|
1184
1187
|
| `--theirs` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes |
|
|
1185
|
-
| `--manual` | | DEPRECATED. use --auto-merge-resolve |
|
|
1186
|
-
| `--auto-merge-resolve <merge-strategy>` | | in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
1187
1188
|
| `--workspace` | | merge only lane components that are in the current workspace |
|
|
1188
1189
|
| `--no-snap` | | do not auto snap after merge completed without conflicts |
|
|
1189
1190
|
| `--tag` | | auto-tag all lane components after merging into main (or tag-merge in case of snap-merge) |
|
|
@@ -1353,7 +1354,7 @@ you can use a pattern for multiple ids, such as bit merge "utils/\*". (wrap the
|
|
|
1353
1354
|
| --------------------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------- |
|
|
1354
1355
|
| `--ours` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification |
|
|
1355
1356
|
| `--theirs` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version |
|
|
1356
|
-
| `--manual` | |
|
|
1357
|
+
| `--manual` | | same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers |
|
|
1357
1358
|
| `--auto-merge-resolve <merge-strategy>` | | in case of a conflict, resolve according to the strategy: [ours, theirs, manual] |
|
|
1358
1359
|
| `--abort` | | in case of an unresolved merge, revert to pre-merge state |
|
|
1359
1360
|
| `--resolve` | | mark an unresolved merge as resolved and create a new snap with the changes |
|
package/dist/cli-reference.json
CHANGED
|
@@ -660,21 +660,6 @@
|
|
|
660
660
|
}
|
|
661
661
|
]
|
|
662
662
|
},
|
|
663
|
-
{
|
|
664
|
-
"name": "component-issues",
|
|
665
|
-
"alias": "",
|
|
666
|
-
"options": [
|
|
667
|
-
[
|
|
668
|
-
"j",
|
|
669
|
-
"json",
|
|
670
|
-
"output issues in json format"
|
|
671
|
-
]
|
|
672
|
-
],
|
|
673
|
-
"description": "list available component-issues",
|
|
674
|
-
"extendedDescription": "",
|
|
675
|
-
"group": "development",
|
|
676
|
-
"private": true
|
|
677
|
-
},
|
|
678
663
|
{
|
|
679
664
|
"name": "show <component-name>",
|
|
680
665
|
"alias": "",
|
|
@@ -711,6 +696,21 @@
|
|
|
711
696
|
}
|
|
712
697
|
]
|
|
713
698
|
},
|
|
699
|
+
{
|
|
700
|
+
"name": "component-issues",
|
|
701
|
+
"alias": "",
|
|
702
|
+
"options": [
|
|
703
|
+
[
|
|
704
|
+
"j",
|
|
705
|
+
"json",
|
|
706
|
+
"output issues in json format"
|
|
707
|
+
]
|
|
708
|
+
],
|
|
709
|
+
"description": "list available component-issues",
|
|
710
|
+
"extendedDescription": "",
|
|
711
|
+
"group": "development",
|
|
712
|
+
"private": true
|
|
713
|
+
},
|
|
714
714
|
{
|
|
715
715
|
"name": "envs",
|
|
716
716
|
"alias": "env",
|
|
@@ -3147,6 +3147,11 @@
|
|
|
3147
3147
|
"auto-merge-resolve <merge-strategy>",
|
|
3148
3148
|
"in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
3149
3149
|
],
|
|
3150
|
+
[
|
|
3151
|
+
"",
|
|
3152
|
+
"manual",
|
|
3153
|
+
"same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
|
|
3154
|
+
],
|
|
3150
3155
|
[
|
|
3151
3156
|
"a",
|
|
3152
3157
|
"all",
|
|
@@ -3467,7 +3472,7 @@
|
|
|
3467
3472
|
[
|
|
3468
3473
|
"",
|
|
3469
3474
|
"manual",
|
|
3470
|
-
"
|
|
3475
|
+
"same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
|
|
3471
3476
|
],
|
|
3472
3477
|
[
|
|
3473
3478
|
"",
|
|
@@ -3878,23 +3883,23 @@
|
|
|
3878
3883
|
"options": [
|
|
3879
3884
|
[
|
|
3880
3885
|
"",
|
|
3881
|
-
"
|
|
3882
|
-
"
|
|
3886
|
+
"manual",
|
|
3887
|
+
"same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
|
|
3883
3888
|
],
|
|
3884
3889
|
[
|
|
3885
3890
|
"",
|
|
3886
|
-
"
|
|
3887
|
-
"
|
|
3891
|
+
"auto-merge-resolve <merge-strategy>",
|
|
3892
|
+
"in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
3888
3893
|
],
|
|
3889
3894
|
[
|
|
3890
3895
|
"",
|
|
3891
|
-
"
|
|
3892
|
-
"DEPRECATED. use --auto-merge-resolve"
|
|
3896
|
+
"ours",
|
|
3897
|
+
"DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications"
|
|
3893
3898
|
],
|
|
3894
3899
|
[
|
|
3895
3900
|
"",
|
|
3896
|
-
"
|
|
3897
|
-
"in case of a
|
|
3901
|
+
"theirs",
|
|
3902
|
+
"DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes"
|
|
3898
3903
|
],
|
|
3899
3904
|
[
|
|
3900
3905
|
"",
|
|
@@ -1525,6 +1525,19 @@ function MDXContent(_ref) {
|
|
|
1525
1525
|
"align": null
|
|
1526
1526
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1527
1527
|
parentName: "td"
|
|
1528
|
+
}, "--manual")), (0, _react2.mdx)("td", {
|
|
1529
|
+
parentName: "tr",
|
|
1530
|
+
"align": "center"
|
|
1531
|
+
}), (0, _react2.mdx)("td", {
|
|
1532
|
+
parentName: "tr",
|
|
1533
|
+
"align": null
|
|
1534
|
+
}, "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers")), (0, _react2.mdx)("tr", {
|
|
1535
|
+
parentName: "tbody"
|
|
1536
|
+
}, (0, _react2.mdx)("td", {
|
|
1537
|
+
parentName: "tr",
|
|
1538
|
+
"align": null
|
|
1539
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
1540
|
+
parentName: "td"
|
|
1528
1541
|
}, "--all")), (0, _react2.mdx)("td", {
|
|
1529
1542
|
parentName: "tr",
|
|
1530
1543
|
"align": "center"
|
|
@@ -5941,52 +5954,52 @@ function MDXContent(_ref) {
|
|
|
5941
5954
|
"align": null
|
|
5942
5955
|
}, (0, _react2.mdx)("inlineCode", {
|
|
5943
5956
|
parentName: "td"
|
|
5944
|
-
}, "--
|
|
5957
|
+
}, "--manual")), (0, _react2.mdx)("td", {
|
|
5945
5958
|
parentName: "tr",
|
|
5946
5959
|
"align": "center"
|
|
5947
5960
|
}), (0, _react2.mdx)("td", {
|
|
5948
5961
|
parentName: "tr",
|
|
5949
5962
|
"align": null
|
|
5950
|
-
}, "
|
|
5963
|
+
}, "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers")), (0, _react2.mdx)("tr", {
|
|
5951
5964
|
parentName: "tbody"
|
|
5952
5965
|
}, (0, _react2.mdx)("td", {
|
|
5953
5966
|
parentName: "tr",
|
|
5954
5967
|
"align": null
|
|
5955
5968
|
}, (0, _react2.mdx)("inlineCode", {
|
|
5956
5969
|
parentName: "td"
|
|
5957
|
-
}, "--
|
|
5970
|
+
}, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
|
|
5958
5971
|
parentName: "tr",
|
|
5959
5972
|
"align": "center"
|
|
5960
5973
|
}), (0, _react2.mdx)("td", {
|
|
5961
5974
|
parentName: "tr",
|
|
5962
5975
|
"align": null
|
|
5963
|
-
}, "
|
|
5976
|
+
}, "in case of a merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
|
|
5964
5977
|
parentName: "tbody"
|
|
5965
5978
|
}, (0, _react2.mdx)("td", {
|
|
5966
5979
|
parentName: "tr",
|
|
5967
5980
|
"align": null
|
|
5968
5981
|
}, (0, _react2.mdx)("inlineCode", {
|
|
5969
5982
|
parentName: "td"
|
|
5970
|
-
}, "--
|
|
5983
|
+
}, "--ours")), (0, _react2.mdx)("td", {
|
|
5971
5984
|
parentName: "tr",
|
|
5972
5985
|
"align": "center"
|
|
5973
5986
|
}), (0, _react2.mdx)("td", {
|
|
5974
5987
|
parentName: "tr",
|
|
5975
5988
|
"align": null
|
|
5976
|
-
}, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
|
|
5989
|
+
}, "DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications")), (0, _react2.mdx)("tr", {
|
|
5977
5990
|
parentName: "tbody"
|
|
5978
5991
|
}, (0, _react2.mdx)("td", {
|
|
5979
5992
|
parentName: "tr",
|
|
5980
5993
|
"align": null
|
|
5981
5994
|
}, (0, _react2.mdx)("inlineCode", {
|
|
5982
5995
|
parentName: "td"
|
|
5983
|
-
}, "--
|
|
5996
|
+
}, "--theirs")), (0, _react2.mdx)("td", {
|
|
5984
5997
|
parentName: "tr",
|
|
5985
5998
|
"align": "center"
|
|
5986
5999
|
}), (0, _react2.mdx)("td", {
|
|
5987
6000
|
parentName: "tr",
|
|
5988
6001
|
"align": null
|
|
5989
|
-
}, "in case of a
|
|
6002
|
+
}, "DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes")), (0, _react2.mdx)("tr", {
|
|
5990
6003
|
parentName: "tbody"
|
|
5991
6004
|
}, (0, _react2.mdx)("td", {
|
|
5992
6005
|
parentName: "tr",
|
|
@@ -7048,7 +7061,7 @@ function MDXContent(_ref) {
|
|
|
7048
7061
|
}), (0, _react2.mdx)("td", {
|
|
7049
7062
|
parentName: "tr",
|
|
7050
7063
|
"align": null
|
|
7051
|
-
}, "
|
|
7064
|
+
}, "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers")), (0, _react2.mdx)("tr", {
|
|
7052
7065
|
parentName: "tbody"
|
|
7053
7066
|
}, (0, _react2.mdx)("td", {
|
|
7054
7067
|
parentName: "tr",
|