@teambit/harmony.content.cli-reference 2.0.909 → 2.0.911
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-1769631668167.js → preview-1770145450170.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -4367,6 +4367,11 @@
|
|
|
4367
4367
|
"",
|
|
4368
4368
|
"lane-name <name>",
|
|
4369
4369
|
"specify the lane name to delete after merge (auto-detected if not provided)"
|
|
4370
|
+
],
|
|
4371
|
+
[
|
|
4372
|
+
"",
|
|
4373
|
+
"skip-push",
|
|
4374
|
+
"skip pushing the changes to the remote repository (useful when CI handles the push separately)"
|
|
4370
4375
|
]
|
|
4371
4376
|
],
|
|
4372
4377
|
"description": "Tags and exports new semantic versions after merging a PR to main.",
|
package/cli-reference.mdx
CHANGED
|
@@ -414,6 +414,7 @@ By default, bumps patch versions when merging to main. If specific configuration
|
|
|
414
414
|
| `--auto-merge-resolve <merge-strategy>` | `-r` | in case of merge conflict during checkout, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
415
415
|
| `--force-theirs` | | do not merge during checkout, just overwrite with incoming files |
|
|
416
416
|
| `--lane-name <name>` | | specify the lane name to delete after merge (auto-detected if not provided) |
|
|
417
|
+
| `--skip-push` | | skip pushing the changes to the remote repository (useful when CI handles the push separately) |
|
|
417
418
|
|
|
418
419
|
---
|
|
419
420
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -4367,6 +4367,11 @@
|
|
|
4367
4367
|
"",
|
|
4368
4368
|
"lane-name <name>",
|
|
4369
4369
|
"specify the lane name to delete after merge (auto-detected if not provided)"
|
|
4370
|
+
],
|
|
4371
|
+
[
|
|
4372
|
+
"",
|
|
4373
|
+
"skip-push",
|
|
4374
|
+
"skip pushing the changes to the remote repository (useful when CI handles the push separately)"
|
|
4370
4375
|
]
|
|
4371
4376
|
],
|
|
4372
4377
|
"description": "Tags and exports new semantic versions after merging a PR to main.",
|
|
@@ -919,7 +919,9 @@ function _createMdxContent(props) {
|
|
|
919
919
|
children: "--force-theirs"
|
|
920
920
|
}), " | | do not merge during checkout, just overwrite with incoming files |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
921
921
|
children: "--lane-name <name>"
|
|
922
|
-
}), " | | specify the lane name to delete after merge (auto-detected if not provided) |"
|
|
922
|
+
}), " | | specify the lane name to delete after merge (auto-detected if not provided) |\n| ", (0, _jsxRuntime.jsx)(_components.code, {
|
|
923
|
+
children: "--skip-push"
|
|
924
|
+
}), " | | skip pushing the changes to the remote repository (useful when CI handles the push separately) |"]
|
|
923
925
|
}), "\n", (0, _jsxRuntime.jsx)(_components.hr, {}), "\n", (0, _jsxRuntime.jsx)(_components.h2, {
|
|
924
926
|
children: "clear-cache"
|
|
925
927
|
}), "\n", (0, _jsxRuntime.jsxs)(_components.p, {
|