@teambit/harmony.content.cli-reference 2.0.973 → 2.0.974
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 +5 -0
- package/cli-reference.mdx +1 -0
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +5 -0
- package/dist/cli-reference.mdx.js +3 -1
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1774991821432.js → preview-1775055917475.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -2701,6 +2701,11 @@
|
|
|
2701
2701
|
"",
|
|
2702
2702
|
"force-theirs",
|
|
2703
2703
|
"do not merge, just overwrite with incoming files"
|
|
2704
|
+
],
|
|
2705
|
+
[
|
|
2706
|
+
"",
|
|
2707
|
+
"include-new-from-scope",
|
|
2708
|
+
"relevant for 'bit checkout head'. import components from the defaultScope that don't exist in the workspace"
|
|
2704
2709
|
]
|
|
2705
2710
|
],
|
|
2706
2711
|
"description": "switch between component versions or remove local changes",
|
package/cli-reference.mdx
CHANGED
|
@@ -359,6 +359,7 @@ the `<to>` argument accepts these values:
|
|
|
359
359
|
| `--skip-dependency-installation` | `-x` | do not auto-install dependencies of the imported components |
|
|
360
360
|
| `--force-ours` | | do not merge, preserve local files as is |
|
|
361
361
|
| `--force-theirs` | | do not merge, just overwrite with incoming files |
|
|
362
|
+
| `--include-new-from-scope` | | relevant for 'bit checkout head'. import components from the defaultScope that don't exist in the workspace |
|
|
362
363
|
|
|
363
364
|
---
|
|
364
365
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -2701,6 +2701,11 @@
|
|
|
2701
2701
|
"",
|
|
2702
2702
|
"force-theirs",
|
|
2703
2703
|
"do not merge, just overwrite with incoming files"
|
|
2704
|
+
],
|
|
2705
|
+
[
|
|
2706
|
+
"",
|
|
2707
|
+
"include-new-from-scope",
|
|
2708
|
+
"relevant for 'bit checkout head'. import components from the defaultScope that don't exist in the workspace"
|
|
2704
2709
|
]
|
|
2705
2710
|
],
|
|
2706
2711
|
"description": "switch between component versions or remove local changes",
|
|
@@ -797,7 +797,9 @@ function _createMdxContent(props) {
|
|
|
797
797
|
children: "--force-ours"
|
|
798
798
|
}), " | | do not merge, preserve local files as is |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
799
799
|
children: "--force-theirs"
|
|
800
|
-
}), " | | do not merge, just overwrite with incoming files |"
|
|
800
|
+
}), " | | do not merge, just overwrite with incoming files |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
801
|
+
children: "--include-new-from-scope"
|
|
802
|
+
}), " | | relevant for 'bit checkout head'. import components from the defaultScope that don't exist in the workspace |"]
|
|
801
803
|
}), "\n", (0, _jsxRuntime.jsx)(_components.hr, {}), "\n", (0, _jsxRuntime.jsx)(_components.h2, {
|
|
802
804
|
children: "ci"
|
|
803
805
|
}), "\n", (0, _jsxRuntime.jsxs)(_components.p, {
|