@teambit/harmony.content.cli-reference 2.0.735 → 2.0.736

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 +5 -0
  3. package/cli-reference.mdx +1 -0
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +5 -0
  6. package/dist/cli-reference.mdx.js +14 -1
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1756150623087.js → preview-1756155772122.js} +2 -2
  9. package/package.json +2 -2
package/cli-reference.docs.mdx CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.12.89'
2
+ description: 'Bit command synopses. Bit version: 1.12.90'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
package/cli-reference.json CHANGED
@@ -4280,6 +4280,11 @@
4280
4280
  "",
4281
4281
  "force-theirs",
4282
4282
  "do not merge during checkout, just overwrite with incoming files"
4283
+ ],
4284
+ [
4285
+ "",
4286
+ "lane-name <name>",
4287
+ "specify the lane name to delete after merge (auto-detected if not provided)"
4283
4288
  ]
4284
4289
  ],
4285
4290
  "description": "Merges a PR",
package/cli-reference.mdx CHANGED
@@ -392,6 +392,7 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
392
392
  | `--verbose` | | show verbose output |
393
393
  | `--auto-merge-resolve <merge-strategy>` | `-r` | in case of merge conflict during checkout, resolve according to the provided strategy: [ours, theirs, manual] |
394
394
  | `--force-theirs` | | do not merge during checkout, just overwrite with incoming files |
395
+ | `--lane-name <name>` | | specify the lane name to delete after merge (auto-detected if not provided) |
395
396
 
396
397
  ---
397
398
 
package/dist/cli-reference.docs.mdx CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.12.89'
2
+ description: 'Bit command synopses. Bit version: 1.12.90'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
package/dist/cli-reference.json CHANGED
@@ -4280,6 +4280,11 @@
4280
4280
  "",
4281
4281
  "force-theirs",
4282
4282
  "do not merge during checkout, just overwrite with incoming files"
4283
+ ],
4284
+ [
4285
+ "",
4286
+ "lane-name <name>",
4287
+ "specify the lane name to delete after merge (auto-detected if not provided)"
4283
4288
  ]
4284
4289
  ],
4285
4290
  "description": "Merges a PR",
package/dist/cli-reference.mdx.js CHANGED
@@ -2184,7 +2184,20 @@ function MDXContent(_ref) {
2184
2184
  }), (0, _react2.mdx)("td", {
2185
2185
  parentName: "tr",
2186
2186
  "align": null
2187
- }, "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", {
2187
+ }, "do not merge during checkout, just overwrite with incoming files")), (0, _react2.mdx)("tr", {
2188
+ parentName: "tbody"
2189
+ }, (0, _react2.mdx)("td", {
2190
+ parentName: "tr",
2191
+ "align": null
2192
+ }, (0, _react2.mdx)("inlineCode", {
2193
+ parentName: "td"
2194
+ }, "--lane-name <name>")), (0, _react2.mdx)("td", {
2195
+ parentName: "tr",
2196
+ "align": "center"
2197
+ }), (0, _react2.mdx)("td", {
2198
+ parentName: "tr",
2199
+ "align": null
2200
+ }, "specify the lane name to delete after merge (auto-detected if not provided)")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "clear-cache"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
2188
2201
  parentName: "p"
2189
2202
  }, "Alias"), ": ", (0, _react2.mdx)("inlineCode", {
2190
2203
  parentName: "p"