@teambit/harmony.content.cli-reference 1.95.60 → 1.95.61
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.json +5 -0
- package/dist/cli-reference.json +5 -0
- package/dist/cli-reference.mdx.js.map +1 -1
- package/package-tar/teambit-harmony.content.cli-reference-1.95.61.tgz +0 -0
- package/package.json +4 -6
- package/{preview-1661830538885.js → preview-1661916601653.js} +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.60.tgz +0 -0
package/cli-reference.json
CHANGED
|
@@ -2132,6 +2132,11 @@
|
|
|
2132
2132
|
"",
|
|
2133
2133
|
"include-deps",
|
|
2134
2134
|
"EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components"
|
|
2135
|
+
],
|
|
2136
|
+
[
|
|
2137
|
+
"",
|
|
2138
|
+
"resolve-unrelated [merge-strategy]",
|
|
2139
|
+
"EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
|
|
2135
2140
|
]
|
|
2136
2141
|
],
|
|
2137
2142
|
"description": "merge a local or a remote lane",
|
package/dist/cli-reference.json
CHANGED
|
@@ -2132,6 +2132,11 @@
|
|
|
2132
2132
|
"",
|
|
2133
2133
|
"include-deps",
|
|
2134
2134
|
"EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components"
|
|
2135
|
+
],
|
|
2136
|
+
[
|
|
2137
|
+
"",
|
|
2138
|
+
"resolve-unrelated [merge-strategy]",
|
|
2139
|
+
"EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
|
|
2135
2140
|
]
|
|
2136
2141
|
],
|
|
2137
2142
|
"description": "merge a local or a remote lane",
|