@teambit/harmony.content.cli-reference 2.0.146 → 2.0.148

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.
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.31'
2
+ description: 'Bit command synopses. Bit version: 1.6.33'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
@@ -2342,6 +2342,11 @@
2342
2342
  "dependents",
2343
2343
  "import components found while traversing from the imported components upwards to the workspace components"
2344
2344
  ],
2345
+ [
2346
+ "",
2347
+ "dependents-dry-run",
2348
+ "same as --dependents, except it prints the found dependents and wait for confirmation before importing them"
2349
+ ],
2345
2350
  [
2346
2351
  "",
2347
2352
  "filter-envs <envs>",
@@ -3175,12 +3180,12 @@
3175
3180
  [
3176
3181
  "",
3177
3182
  "force-ours",
3178
- "regardless of conflicts, ignore theirs changes and keep our local files intact"
3183
+ "do not merge, preserve local files as is"
3179
3184
  ],
3180
3185
  [
3181
3186
  "",
3182
3187
  "force-theirs",
3183
- "regardless of conflicts, ignore our local changes and use theirs files"
3188
+ "do not merge, just overwrite with incoming files"
3184
3189
  ]
3185
3190
  ],
3186
3191
  "description": "switch between component versions or remove local changes",
package/cli-reference.mdx CHANGED
@@ -299,8 +299,8 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
299
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 |
300
300
  | `--verbose` | `-v` | showing verbose output for inspection |
301
301
  | `--skip-dependency-installation` | `-x` | do not auto-install dependencies of the imported components |
302
- | `--force-ours` | | regardless of conflicts, ignore theirs changes and keep our local files intact |
303
- | `--force-theirs` | | regardless of conflicts, ignore our local changes and use theirs files |
302
+ | `--force-ours` | | do not merge, preserve local files as is |
303
+ | `--force-theirs` | | do not merge, just overwrite with incoming files |
304
304
 
305
305
  ---
306
306
 
@@ -907,6 +907,7 @@ bit export => export all staged snaps/tags of components to their remote scope.
907
907
  | `--merge [strategy]` | `-m` | merge local changes with the imported version. strategy should be "theirs", "ours" or "manual" |
908
908
  | `--dependencies` | | import all dependencies (bit components only) of imported components and write them to the workspace |
909
909
  | `--dependents` | | import components found while traversing from the imported components upwards to the workspace components |
910
+ | `--dependents-dry-run` | | same as --dependents, except it prints the found dependents and wait for confirmation before importing them |
910
911
  | `--filter-envs <envs>` | | only import components that have the specified environment (e.g., "teambit.react/react-env") |
911
912
  | `--save-in-lane` | | when checked out to a lane and the component is not on the remote-lane, save it in the lane (defaults to save on main) |
912
913
  | `--all-history` | | relevant for fetching all components objects. avoid optimizations, fetch all history versions, always |
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.31'
2
+ description: 'Bit command synopses. Bit version: 1.6.33'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
@@ -2342,6 +2342,11 @@
2342
2342
  "dependents",
2343
2343
  "import components found while traversing from the imported components upwards to the workspace components"
2344
2344
  ],
2345
+ [
2346
+ "",
2347
+ "dependents-dry-run",
2348
+ "same as --dependents, except it prints the found dependents and wait for confirmation before importing them"
2349
+ ],
2345
2350
  [
2346
2351
  "",
2347
2352
  "filter-envs <envs>",
@@ -3175,12 +3180,12 @@
3175
3180
  [
3176
3181
  "",
3177
3182
  "force-ours",
3178
- "regardless of conflicts, ignore theirs changes and keep our local files intact"
3183
+ "do not merge, preserve local files as is"
3179
3184
  ],
3180
3185
  [
3181
3186
  "",
3182
3187
  "force-theirs",
3183
- "regardless of conflicts, ignore our local changes and use theirs files"
3188
+ "do not merge, just overwrite with incoming files"
3184
3189
  ]
3185
3190
  ],
3186
3191
  "description": "switch between component versions or remove local changes",
@@ -1604,7 +1604,7 @@ function MDXContent(_ref) {
1604
1604
  }), (0, _react2.mdx)("td", {
1605
1605
  parentName: "tr",
1606
1606
  "align": null
1607
- }, "regardless of conflicts, ignore theirs changes and keep our local files intact")), (0, _react2.mdx)("tr", {
1607
+ }, "do not merge, preserve local files as is")), (0, _react2.mdx)("tr", {
1608
1608
  parentName: "tbody"
1609
1609
  }, (0, _react2.mdx)("td", {
1610
1610
  parentName: "tr",
@@ -1617,7 +1617,7 @@ function MDXContent(_ref) {
1617
1617
  }), (0, _react2.mdx)("td", {
1618
1618
  parentName: "tr",
1619
1619
  "align": null
1620
- }, "regardless of conflicts, ignore our local changes and use theirs files")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "clear-cache"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
1620
+ }, "do not merge, just overwrite with incoming files")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "clear-cache"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
1621
1621
  parentName: "p"
1622
1622
  }, "Alias"), ": ", (0, _react2.mdx)("inlineCode", {
1623
1623
  parentName: "p"
@@ -4406,6 +4406,19 @@ function MDXContent(_ref) {
4406
4406
  "align": null
4407
4407
  }, (0, _react2.mdx)("inlineCode", {
4408
4408
  parentName: "td"
4409
+ }, "--dependents-dry-run")), (0, _react2.mdx)("td", {
4410
+ parentName: "tr",
4411
+ "align": "center"
4412
+ }), (0, _react2.mdx)("td", {
4413
+ parentName: "tr",
4414
+ "align": null
4415
+ }, "same as --dependents, except it prints the found dependents and wait for confirmation before importing them")), (0, _react2.mdx)("tr", {
4416
+ parentName: "tbody"
4417
+ }, (0, _react2.mdx)("td", {
4418
+ parentName: "tr",
4419
+ "align": null
4420
+ }, (0, _react2.mdx)("inlineCode", {
4421
+ parentName: "td"
4409
4422
  }, "--filter-envs <envs>")), (0, _react2.mdx)("td", {
4410
4423
  parentName: "tr",
4411
4424
  "align": "center"