@teambit/harmony.content.cli-reference 2.0.706 → 2.0.708
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 +10 -0
- package/cli-reference.mdx +16 -14
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +10 -0
- package/dist/cli-reference.mdx.js +29 -1
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1755010065594.js → preview-1755019338160.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -4260,6 +4260,16 @@
|
|
|
4260
4260
|
"",
|
|
4261
4261
|
"verbose",
|
|
4262
4262
|
"show verbose output"
|
|
4263
|
+
],
|
|
4264
|
+
[
|
|
4265
|
+
"r",
|
|
4266
|
+
"auto-merge-resolve <merge-strategy>",
|
|
4267
|
+
"in case of merge conflict during checkout, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
4268
|
+
],
|
|
4269
|
+
[
|
|
4270
|
+
"",
|
|
4271
|
+
"force-theirs",
|
|
4272
|
+
"do not merge during checkout, just overwrite with incoming files"
|
|
4263
4273
|
]
|
|
4264
4274
|
],
|
|
4265
4275
|
"description": "Merges a PR",
|
package/cli-reference.mdx
CHANGED
|
@@ -375,20 +375,22 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
|
|
|
375
375
|
|
|
376
376
|
**Description**: Merges a PR
|
|
377
377
|
|
|
378
|
-
| **Option**
|
|
379
|
-
|
|
|
380
|
-
| `--message <message>`
|
|
381
|
-
| `--build`
|
|
382
|
-
| `--strict`
|
|
383
|
-
| `--increment <level>`
|
|
384
|
-
| `--prerelease-id <id>`
|
|
385
|
-
| `--patch`
|
|
386
|
-
| `--minor`
|
|
387
|
-
| `--major`
|
|
388
|
-
| `--pre-release [identifier]`
|
|
389
|
-
| `--increment-by <number>`
|
|
390
|
-
| `--versions-file <path>`
|
|
391
|
-
| `--verbose`
|
|
378
|
+
| **Option** | **Option alias** | **Description** |
|
|
379
|
+
| --------------------------------------- | :--------------: | ------------------------------------------------------------------------------------------------------------- |
|
|
380
|
+
| `--message <message>` | `-m` | If set, use it as the tag message, if not, try and grab from git-commit-message |
|
|
381
|
+
| `--build` | `-b` | Set to true to build the app locally, false (default) will build on Ripple CI |
|
|
382
|
+
| `--strict` | `-s` | Set to true to fail on warnings as well as errors, false (default) only fails on errors |
|
|
383
|
+
| `--increment <level>` | `-l` | options are: [major, premajor, minor, preminor, patch, prepatch, prerelease], default to patch |
|
|
384
|
+
| `--prerelease-id <id>` | | prerelease identifier (e.g. "dev" to get "1.0.0-dev.1") |
|
|
385
|
+
| `--patch` | `-p` | syntactic sugar for "--increment patch" |
|
|
386
|
+
| `--minor` | | syntactic sugar for "--increment minor" |
|
|
387
|
+
| `--major` | | syntactic sugar for "--increment major" |
|
|
388
|
+
| `--pre-release [identifier]` | | syntactic sugar for "--increment prerelease" and `--prerelease-id <identifier>` |
|
|
389
|
+
| `--increment-by <number>` | | (default to 1) increment semver flag (patch/minor/major) by. e.g. incrementing patch by 2: 0.0.1 -> 0.0.3. |
|
|
390
|
+
| `--versions-file <path>` | | path to a file containing component versions. format: "component-id: version" |
|
|
391
|
+
| `--verbose` | | show verbose output |
|
|
392
|
+
| `--auto-merge-resolve <merge-strategy>` | `-r` | in case of merge conflict during checkout, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
393
|
+
| `--force-theirs` | | do not merge during checkout, just overwrite with incoming files |
|
|
392
394
|
|
|
393
395
|
---
|
|
394
396
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -4260,6 +4260,16 @@
|
|
|
4260
4260
|
"",
|
|
4261
4261
|
"verbose",
|
|
4262
4262
|
"show verbose output"
|
|
4263
|
+
],
|
|
4264
|
+
[
|
|
4265
|
+
"r",
|
|
4266
|
+
"auto-merge-resolve <merge-strategy>",
|
|
4267
|
+
"in case of merge conflict during checkout, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
4268
|
+
],
|
|
4269
|
+
[
|
|
4270
|
+
"",
|
|
4271
|
+
"force-theirs",
|
|
4272
|
+
"do not merge during checkout, just overwrite with incoming files"
|
|
4263
4273
|
]
|
|
4264
4274
|
],
|
|
4265
4275
|
"description": "Merges a PR",
|
|
@@ -2141,7 +2141,35 @@ function MDXContent(_ref) {
|
|
|
2141
2141
|
}), (0, _react2.mdx)("td", {
|
|
2142
2142
|
parentName: "tr",
|
|
2143
2143
|
"align": null
|
|
2144
|
-
}, "show verbose output"))
|
|
2144
|
+
}, "show verbose output")), (0, _react2.mdx)("tr", {
|
|
2145
|
+
parentName: "tbody"
|
|
2146
|
+
}, (0, _react2.mdx)("td", {
|
|
2147
|
+
parentName: "tr",
|
|
2148
|
+
"align": null
|
|
2149
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
2150
|
+
parentName: "td"
|
|
2151
|
+
}, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
|
|
2152
|
+
parentName: "tr",
|
|
2153
|
+
"align": "center"
|
|
2154
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
2155
|
+
parentName: "td"
|
|
2156
|
+
}, "-r")), (0, _react2.mdx)("td", {
|
|
2157
|
+
parentName: "tr",
|
|
2158
|
+
"align": null
|
|
2159
|
+
}, "in case of merge conflict during checkout, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
|
|
2160
|
+
parentName: "tbody"
|
|
2161
|
+
}, (0, _react2.mdx)("td", {
|
|
2162
|
+
parentName: "tr",
|
|
2163
|
+
"align": null
|
|
2164
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
2165
|
+
parentName: "td"
|
|
2166
|
+
}, "--force-theirs")), (0, _react2.mdx)("td", {
|
|
2167
|
+
parentName: "tr",
|
|
2168
|
+
"align": "center"
|
|
2169
|
+
}), (0, _react2.mdx)("td", {
|
|
2170
|
+
parentName: "tr",
|
|
2171
|
+
"align": null
|
|
2172
|
+
}, "do not merge during checkout, 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", {
|
|
2145
2173
|
parentName: "p"
|
|
2146
2174
|
}, "Alias"), ": ", (0, _react2.mdx)("inlineCode", {
|
|
2147
2175
|
parentName: "p"
|