@teambit/harmony.content.cli-reference 2.0.938 → 2.0.940
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 +15 -0
- package/cli-reference.mdx +8 -5
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +15 -0
- package/dist/cli-reference.mdx.js +13 -5
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1772808176467.js → preview-1773159745847.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -3738,6 +3738,21 @@
|
|
|
3738
3738
|
"",
|
|
3739
3739
|
"branch",
|
|
3740
3740
|
"create and checkout a new git branch named after the lane"
|
|
3741
|
+
],
|
|
3742
|
+
[
|
|
3743
|
+
"r",
|
|
3744
|
+
"auto-merge-resolve <merge-strategy>",
|
|
3745
|
+
"merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
|
|
3746
|
+
],
|
|
3747
|
+
[
|
|
3748
|
+
"",
|
|
3749
|
+
"force-ours",
|
|
3750
|
+
"do not merge, preserve local files as is"
|
|
3751
|
+
],
|
|
3752
|
+
[
|
|
3753
|
+
"",
|
|
3754
|
+
"force-theirs",
|
|
3755
|
+
"do not merge, just overwrite with incoming files"
|
|
3741
3756
|
]
|
|
3742
3757
|
],
|
|
3743
3758
|
"description": "import a remote lane to your workspace and switch to that lane",
|
package/cli-reference.mdx
CHANGED
|
@@ -1358,11 +1358,14 @@ bit lane diff from to => diff between "from" lane and "to" lane.
|
|
|
1358
1358
|
| ------- | :------------------: |
|
|
1359
1359
|
| `lane` | the remote lane name |
|
|
1360
1360
|
|
|
1361
|
-
| **Option**
|
|
1362
|
-
|
|
|
1363
|
-
| `--skip-dependency-installation`
|
|
1364
|
-
| `--pattern <component-pattern>`
|
|
1365
|
-
| `--branch`
|
|
1361
|
+
| **Option** | **Option alias** | **Description** |
|
|
1362
|
+
| --------------------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------------------------- |
|
|
1363
|
+
| `--skip-dependency-installation` | `-x` | do not install dependencies of the imported components |
|
|
1364
|
+
| `--pattern <component-pattern>` | `-p` | import only components from the lane that fit the specified component-pattern to the workspace. works only when the workspace is empty |
|
|
1365
|
+
| `--branch` | | create and checkout a new git branch named after the lane |
|
|
1366
|
+
| `--auto-merge-resolve <merge-strategy>` | `-r` | merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual" |
|
|
1367
|
+
| `--force-ours` | | do not merge, preserve local files as is |
|
|
1368
|
+
| `--force-theirs` | | do not merge, just overwrite with incoming files |
|
|
1366
1369
|
|
|
1367
1370
|
### lane remove-comp
|
|
1368
1371
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -3738,6 +3738,21 @@
|
|
|
3738
3738
|
"",
|
|
3739
3739
|
"branch",
|
|
3740
3740
|
"create and checkout a new git branch named after the lane"
|
|
3741
|
+
],
|
|
3742
|
+
[
|
|
3743
|
+
"r",
|
|
3744
|
+
"auto-merge-resolve <merge-strategy>",
|
|
3745
|
+
"merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
|
|
3746
|
+
],
|
|
3747
|
+
[
|
|
3748
|
+
"",
|
|
3749
|
+
"force-ours",
|
|
3750
|
+
"do not merge, preserve local files as is"
|
|
3751
|
+
],
|
|
3752
|
+
[
|
|
3753
|
+
"",
|
|
3754
|
+
"force-theirs",
|
|
3755
|
+
"do not merge, just overwrite with incoming files"
|
|
3741
3756
|
]
|
|
3742
3757
|
],
|
|
3743
3758
|
"description": "import a remote lane to your workspace and switch to that lane",
|
|
@@ -2837,21 +2837,29 @@ function _createMdxContent(props) {
|
|
|
2837
2837
|
}), "\n", (0, _jsxRuntime.jsxs)(_components.p, {
|
|
2838
2838
|
children: ["| ", (0, _jsxRuntime.jsx)(_components.strong, {
|
|
2839
2839
|
children: "Option"
|
|
2840
|
-
}), "
|
|
2840
|
+
}), " | ", (0, _jsxRuntime.jsx)(_components.strong, {
|
|
2841
2841
|
children: "Option alias"
|
|
2842
2842
|
}), " | ", (0, _jsxRuntime.jsx)(_components.strong, {
|
|
2843
2843
|
children: "Description"
|
|
2844
|
-
}), " |\n|
|
|
2844
|
+
}), " |\n| --------------------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------------------------- |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2845
2845
|
children: "--skip-dependency-installation"
|
|
2846
|
-
}), "
|
|
2846
|
+
}), " | ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2847
2847
|
children: "-x"
|
|
2848
2848
|
}), " | do not install dependencies of the imported components |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2849
2849
|
children: "--pattern <component-pattern>"
|
|
2850
|
-
}), "
|
|
2850
|
+
}), " | ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2851
2851
|
children: "-p"
|
|
2852
2852
|
}), " | import only components from the lane that fit the specified component-pattern to the workspace. works only when the workspace is empty |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2853
2853
|
children: "--branch"
|
|
2854
|
-
}), "
|
|
2854
|
+
}), " | | create and checkout a new git branch named after the lane |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2855
|
+
children: "--auto-merge-resolve <merge-strategy>"
|
|
2856
|
+
}), " | ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2857
|
+
children: "-r"
|
|
2858
|
+
}), " | merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\" |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2859
|
+
children: "--force-ours"
|
|
2860
|
+
}), " | | do not merge, preserve local files as is |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
2861
|
+
children: "--force-theirs"
|
|
2862
|
+
}), " | | do not merge, just overwrite with incoming files |"]
|
|
2855
2863
|
}), "\n", (0, _jsxRuntime.jsx)(_components.h3, {
|
|
2856
2864
|
children: "lane remove-comp"
|
|
2857
2865
|
}), "\n", (0, _jsxRuntime.jsxs)(_components.p, {
|