@teambit/harmony.content.cli-reference 2.0.105 → 2.0.106
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
CHANGED
|
@@ -2981,7 +2981,7 @@
|
|
|
2981
2981
|
]
|
|
2982
2982
|
],
|
|
2983
2983
|
"description": "switch between component versions or remove local changes",
|
|
2984
|
-
"extendedDescription": "\n
|
|
2984
|
+
"extendedDescription": "\n`bit checkout <version> [component-pattern]` => checkout the specified ids (or all components when --all is used) to the specified version\n`bit checkout head [component-pattern]` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all\n`bit checkout latest [component-pattern]` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n`bit checkout reset [component-pattern]` => remove local modifications from the specified ids (or all components when --all is used)\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"",
|
|
2985
2985
|
"group": "development",
|
|
2986
2986
|
"private": false,
|
|
2987
2987
|
"arguments": [
|
|
@@ -3735,7 +3735,12 @@
|
|
|
3735
3735
|
[
|
|
3736
3736
|
"",
|
|
3737
3737
|
"include-non-lane-comps",
|
|
3738
|
-
"when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
|
|
3738
|
+
"DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
|
|
3739
|
+
],
|
|
3740
|
+
[
|
|
3741
|
+
"",
|
|
3742
|
+
"exclude-non-lane-comps",
|
|
3743
|
+
"when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)"
|
|
3739
3744
|
]
|
|
3740
3745
|
],
|
|
3741
3746
|
"description": "merge a local or a remote lane to the current lane",
|
package/cli-reference.mdx
CHANGED
|
@@ -278,9 +278,10 @@ with no args, only workspace's capsules are deleted
|
|
|
278
278
|
**Description**: switch between component versions or remove local changes
|
|
279
279
|
|
|
280
280
|
`bit checkout <version> [component-pattern]` => checkout the specified ids (or all components when --all is used) to the specified version
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
281
|
+
`bit checkout head [component-pattern]` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all
|
|
282
|
+
`bit checkout latest [component-pattern]` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all
|
|
283
|
+
`bit checkout reset [component-pattern]` => remove local modifications from the specified ids (or all components when --all is used)
|
|
284
|
+
when on a lane, "checkout head" only checks out components on this lane. to update main components, run "bit lane merge main"
|
|
284
285
|
|
|
285
286
|
`bit checkout <to> [component-pattern]`
|
|
286
287
|
|
|
@@ -1176,27 +1177,28 @@ this flag keeps the history of one end and saves a reference to the other end. t
|
|
|
1176
1177
|
| `lane` | lane-name or full lane-id (if remote) to merge to the current lane |
|
|
1177
1178
|
| `pattern` | partially merge the lane - only components that match the specified component-pattern Component pattern format: component name, component id, or component pattern. use component pattern to select multiple components. wrap the pattern with quotes. use comma to separate patterns and "!" to exclude. e.g. "ui/\*\*, !ui/button". use `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern. |
|
|
1178
1179
|
|
|
1179
|
-
| **Option** | **Option alias** | **Description**
|
|
1180
|
-
| --------------------------------------- | :--------------: |
|
|
1181
|
-
| `--ours` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications
|
|
1182
|
-
| `--theirs` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes
|
|
1183
|
-
| `--manual` | | DEPRECATED. use --auto-merge-resolve
|
|
1184
|
-
| `--auto-merge-resolve <merge-strategy>` | | in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]
|
|
1185
|
-
| `--workspace` | | merge only lane components that are in the current workspace
|
|
1186
|
-
| `--no-snap` | | do not auto snap after merge completed without conflicts
|
|
1187
|
-
| `--tag` | | auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)
|
|
1188
|
-
| `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build)
|
|
1189
|
-
| `--message <message>` | `-m` | override the default message for the auto snap
|
|
1190
|
-
| `--keep-readme` | | skip deleting the lane readme component after merging
|
|
1191
|
-
| `--no-squash` | | relevant for merging lanes into main, which by default squashes all lane snaps
|
|
1192
|
-
| `--squash` | | EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash
|
|
1193
|
-
| `--ignore-config-changes` | | allow merging when components are modified due to config changes (such as dependencies) only and not files
|
|
1194
|
-
| `--verbose` | | show details of components that were not merged successfully
|
|
1195
|
-
| `--skip-dependency-installation` | `-x` | do not install dependencies of the imported components
|
|
1196
|
-
| `--skip-fetch` | | use the local state of target-lane if exits locally, without updating it from the remote
|
|
1197
|
-
| `--include-deps` | | relevant for "--pattern" and "--workspace". merge also dependencies of the specified components
|
|
1198
|
-
| `--resolve-unrelated [merge-strategy]` | | relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"
|
|
1199
|
-
| `--include-non-lane-comps` | | when merging main, include workspace components that are not on the lane (by default only lane components are merged)
|
|
1180
|
+
| **Option** | **Option alias** | **Description** |
|
|
1181
|
+
| --------------------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
1182
|
+
| `--ours` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications |
|
|
1183
|
+
| `--theirs` | | DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes |
|
|
1184
|
+
| `--manual` | | DEPRECATED. use --auto-merge-resolve |
|
|
1185
|
+
| `--auto-merge-resolve <merge-strategy>` | | in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
1186
|
+
| `--workspace` | | merge only lane components that are in the current workspace |
|
|
1187
|
+
| `--no-snap` | | do not auto snap after merge completed without conflicts |
|
|
1188
|
+
| `--tag` | | auto-tag all lane components after merging into main (or tag-merge in case of snap-merge) |
|
|
1189
|
+
| `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
|
|
1190
|
+
| `--message <message>` | `-m` | override the default message for the auto snap |
|
|
1191
|
+
| `--keep-readme` | | skip deleting the lane readme component after merging |
|
|
1192
|
+
| `--no-squash` | | relevant for merging lanes into main, which by default squashes all lane snaps |
|
|
1193
|
+
| `--squash` | | EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash |
|
|
1194
|
+
| `--ignore-config-changes` | | allow merging when components are modified due to config changes (such as dependencies) only and not files |
|
|
1195
|
+
| `--verbose` | | show details of components that were not merged successfully |
|
|
1196
|
+
| `--skip-dependency-installation` | `-x` | do not install dependencies of the imported components |
|
|
1197
|
+
| `--skip-fetch` | | use the local state of target-lane if exits locally, without updating it from the remote |
|
|
1198
|
+
| `--include-deps` | | relevant for "--pattern" and "--workspace". merge also dependencies of the specified components |
|
|
1199
|
+
| `--resolve-unrelated [merge-strategy]` | | relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs" |
|
|
1200
|
+
| `--include-non-lane-comps` | | DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged) |
|
|
1201
|
+
| `--exclude-non-lane-comps` | | when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged) |
|
|
1200
1202
|
|
|
1201
1203
|
### lane merge-abort
|
|
1202
1204
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -2981,7 +2981,7 @@
|
|
|
2981
2981
|
]
|
|
2982
2982
|
],
|
|
2983
2983
|
"description": "switch between component versions or remove local changes",
|
|
2984
|
-
"extendedDescription": "\n
|
|
2984
|
+
"extendedDescription": "\n`bit checkout <version> [component-pattern]` => checkout the specified ids (or all components when --all is used) to the specified version\n`bit checkout head [component-pattern]` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all\n`bit checkout latest [component-pattern]` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n`bit checkout reset [component-pattern]` => remove local modifications from the specified ids (or all components when --all is used)\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"",
|
|
2985
2985
|
"group": "development",
|
|
2986
2986
|
"private": false,
|
|
2987
2987
|
"arguments": [
|
|
@@ -3735,7 +3735,12 @@
|
|
|
3735
3735
|
[
|
|
3736
3736
|
"",
|
|
3737
3737
|
"include-non-lane-comps",
|
|
3738
|
-
"when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
|
|
3738
|
+
"DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
|
|
3739
|
+
],
|
|
3740
|
+
[
|
|
3741
|
+
"",
|
|
3742
|
+
"exclude-non-lane-comps",
|
|
3743
|
+
"when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)"
|
|
3739
3744
|
]
|
|
3740
3745
|
],
|
|
3741
3746
|
"description": "merge a local or a remote lane to the current lane",
|
|
@@ -1414,17 +1414,19 @@ function MDXContent(_ref) {
|
|
|
1414
1414
|
parentName: "p"
|
|
1415
1415
|
}, "bit checkout <version> [component-pattern]"), " => checkout the specified ids (or all components when --all is used) to the specified version", (0, _react2.mdx)("br", {
|
|
1416
1416
|
parentName: "p"
|
|
1417
|
-
}), "\n",
|
|
1417
|
+
}), "\n", (0, _react2.mdx)("inlineCode", {
|
|
1418
1418
|
parentName: "p"
|
|
1419
1419
|
}, "bit checkout head [component-pattern]"), " => checkout to the last snap/tag (use --latest if you only want semver tags), omit ", "[component-pattern]", " to checkout head for all", (0, _react2.mdx)("br", {
|
|
1420
1420
|
parentName: "p"
|
|
1421
|
-
}), "\n",
|
|
1421
|
+
}), "\n", (0, _react2.mdx)("inlineCode", {
|
|
1422
1422
|
parentName: "p"
|
|
1423
1423
|
}, "bit checkout latest [component-pattern]"), " => checkout to the latest satisfying semver tag, omit ", "[component-pattern]", " to checkout latest for all", (0, _react2.mdx)("br", {
|
|
1424
1424
|
parentName: "p"
|
|
1425
|
-
}), "\n",
|
|
1425
|
+
}), "\n", (0, _react2.mdx)("inlineCode", {
|
|
1426
|
+
parentName: "p"
|
|
1427
|
+
}, "bit checkout reset [component-pattern]"), " => remove local modifications from the specified ids (or all components when --all is used)", (0, _react2.mdx)("br", {
|
|
1426
1428
|
parentName: "p"
|
|
1427
|
-
}, "
|
|
1429
|
+
}), "\n", "when on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\""), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
|
|
1428
1430
|
parentName: "p"
|
|
1429
1431
|
}, "bit checkout <to> [component-pattern]")), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
|
|
1430
1432
|
parentName: "table"
|
|
@@ -6138,7 +6140,20 @@ function MDXContent(_ref) {
|
|
|
6138
6140
|
}), (0, _react2.mdx)("td", {
|
|
6139
6141
|
parentName: "tr",
|
|
6140
6142
|
"align": null
|
|
6141
|
-
}, "when merging main, include workspace components that are not on the lane (by default only lane components are merged)"))
|
|
6143
|
+
}, "DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)")), (0, _react2.mdx)("tr", {
|
|
6144
|
+
parentName: "tbody"
|
|
6145
|
+
}, (0, _react2.mdx)("td", {
|
|
6146
|
+
parentName: "tr",
|
|
6147
|
+
"align": null
|
|
6148
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
6149
|
+
parentName: "td"
|
|
6150
|
+
}, "--exclude-non-lane-comps")), (0, _react2.mdx)("td", {
|
|
6151
|
+
parentName: "tr",
|
|
6152
|
+
"align": "center"
|
|
6153
|
+
}), (0, _react2.mdx)("td", {
|
|
6154
|
+
parentName: "tr",
|
|
6155
|
+
"align": null
|
|
6156
|
+
}, "when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)")))), (0, _react2.mdx)("h3", null, "lane merge-abort"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
|
|
6142
6157
|
parentName: "p"
|
|
6143
6158
|
}, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
|
|
6144
6159
|
parentName: "p"
|