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

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.
Files changed (9) hide show
  1. package/cli-reference.docs.mdx +1 -1
  2. package/cli-reference.json +2 -2
  3. package/cli-reference.mdx +2 -2
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +2 -2
  6. package/dist/cli-reference.mdx.js +2 -2
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1705577037962.js → preview-1705634165230.js} +2 -2
  9. package/package.json +2 -2
package/cli-reference.docs.mdx CHANGED
@@ -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.32'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/cli-reference.json CHANGED
@@ -3175,12 +3175,12 @@
3175
3175
  [
3176
3176
  "",
3177
3177
  "force-ours",
3178
- "regardless of conflicts, ignore theirs changes and keep our local files intact"
3178
+ "do not merge, preserve local files as is"
3179
3179
  ],
3180
3180
  [
3181
3181
  "",
3182
3182
  "force-theirs",
3183
- "regardless of conflicts, ignore our local changes and use theirs files"
3183
+ "do not merge, just overwrite with incoming files"
3184
3184
  ]
3185
3185
  ],
3186
3186
  "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
 
package/dist/cli-reference.docs.mdx CHANGED
@@ -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.32'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/dist/cli-reference.json CHANGED
@@ -3175,12 +3175,12 @@
3175
3175
  [
3176
3176
  "",
3177
3177
  "force-ours",
3178
- "regardless of conflicts, ignore theirs changes and keep our local files intact"
3178
+ "do not merge, preserve local files as is"
3179
3179
  ],
3180
3180
  [
3181
3181
  "",
3182
3182
  "force-theirs",
3183
- "regardless of conflicts, ignore our local changes and use theirs files"
3183
+ "do not merge, just overwrite with incoming files"
3184
3184
  ]
3185
3185
  ],
3186
3186
  "description": "switch between component versions or remove local changes",
package/dist/cli-reference.mdx.js CHANGED
@@ -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"