@teambit/merge-lanes 0.0.0-03bafa4b511c8c802476c3037efbe9a84c4c66cb

package/dist/merge-lane.cmd.js

@@ -0,0 +1,173 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeLaneCmd = void 0;
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+  _chalk = function () {
+    return data;
+  };
+  return data;
+}
+function _merging() {
+  const data = require("@teambit/merging");
+  _merging = function () {
+    return data;
+  };
+  return data;
+}
+function _legacy() {
+  const data = require("@teambit/legacy.constants");
+  _legacy = function () {
+    return data;
+  };
+  return data;
+}
+function _bitError() {
+  const data = require("@teambit/bit-error");
+  _bitError = function () {
+    return data;
+  };
+  return data;
+}
+function _remove() {
+  const data = require("@teambit/remove");
+  _remove = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class MergeLaneCmd {
+  constructor(mergeLanes, configStore) {
+    this.mergeLanes = mergeLanes;
+    this.configStore = configStore;
+    _defineProperty(this, "name", 'merge <lane> [pattern]');
+    _defineProperty(this, "description", `merge a local or a remote lane to the current lane`);
+    _defineProperty(this, "extendedDescription", `by default, the provided lane will be fetched from the remote before merging.
+to merge the lane from the local scope without updating it first, use "--skip-fetch" flag.
+
+when the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,
+these components will be snap-merged to complete the merge. use "no-auto-snap" to opt-out, or "tag" to tag instead.
+
+when the components are not diverged in history, and the current lane is behind the merge candidate, the merge will
+simply update the components and the heads according to the merge candidate.
+to opt-out, use "--no-snap", the components will be written as the merge candidate, and will be left as modified.
+
+in case a component in both ends don't share history (no snap is found in common), the merge will require "--resolve-unrelated" flag.
+this flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:
+1. if the component exists on main, then the history linked to main will be kept.
+in this case, the strategy of "--resolve-unrelated" only determines which source-code to keep. it's not about the history.
+2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.
+unless "--resolve-unrelated" is set to "theirs", in which case the history of the other lane will be kept.
+2. a. an edge case: if the component is deleted on the current lane, the strategy will always be "theirs".
+so then the history (and the source-code) of the other lane will be kept.
+`);
+    _defineProperty(this, "arguments", [{
+      name: 'lane',
+      description: 'lane-name or full lane-id (if remote) to merge to the current lane'
+    }, {
+      name: 'pattern',
+      description: `partially merge the lane - only components that match the specified component-pattern
+Component pattern format: ${_legacy().COMPONENT_PATTERN_HELP}`
+    }]);
+    _defineProperty(this, "alias", '');
+    _defineProperty(this, "options", [['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['r', 'auto-merge-resolve <merge-strategy>', 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'], ['', 'workspace', 'merge only lane components that are in the current workspace'], ['', 'no-auto-snap', 'do not auto snap after merge completed without conflicts of diverged components (see command description)'], ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'], ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'loose', 'relevant for --build, to allow build to succeed even if tasks like tests or lint fail'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'], ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when components are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'display detailed information about components that were legitimately unmerged'], ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'], ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'], ['', 'include-deps', 'relevant for "pattern" and "--workspace". merge also dependencies of the specified components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)'], ['', 'exclude-non-lane-comps', 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)'], ['', 'detach-head', 'UNSUPPORTED YET. for each component, find the divergent point from main and merge to that point. do not change the head']]);
+    _defineProperty(this, "loader", true);
+    _defineProperty(this, "private", true);
+    _defineProperty(this, "remoteOp", true);
+  }
+  async report([name, pattern], {
+    ours,
+    theirs,
+    manual,
+    autoMergeResolve,
+    build,
+    workspace: existingOnWorkspaceOnly = false,
+    squash = false,
+    noAutoSnap = false,
+    noSnap = false,
+    tag = false,
+    message: snapMessage = '',
+    keepReadme = false,
+    noSquash = false,
+    skipDependencyInstallation = false,
+    skipFetch = false,
+    includeDeps = false,
+    resolveUnrelated,
+    ignoreConfigChanges,
+    verbose = false,
+    excludeNonLaneComps = false,
+    detachHead,
+    loose = false
+  }) {
+    build = this.configStore.getConfigBoolean(_legacy().CFG_FORCE_LOCAL_BUILD) || Boolean(build);
+    if (ours || theirs) {
+      throw new (_bitError().BitError)('the "--ours" and "--theirs" flags are deprecated. use "--auto-merge-resolve" instead. see "bit lane merge --help" for more information');
+    }
+    if (autoMergeResolve && autoMergeResolve !== 'ours' && autoMergeResolve !== 'theirs' && autoMergeResolve !== 'manual') {
+      throw new (_bitError().BitError)('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');
+    }
+    if (manual) autoMergeResolve = 'manual';
+    const mergeStrategy = autoMergeResolve;
+    if (noAutoSnap && snapMessage) throw new (_bitError().BitError)('unable to use "no-snap" and "message" flags together');
+    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {
+      throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --workspace and --pattern flags`);
+    }
+    const getResolveUnrelated = () => {
+      if (!resolveUnrelated) return undefined;
+      if (typeof resolveUnrelated === 'boolean') return 'ours';
+      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {
+        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');
+      }
+      return resolveUnrelated;
+    };
+    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {
+      resolveUnrelated = 'ours';
+    }
+    const {
+      mergeResults,
+      deleteResults,
+      configMergeResults
+    } = await this.mergeLanes.mergeLaneByCLI(name, {
+      build,
+      // @ts-ignore
+      mergeStrategy,
+      ours,
+      theirs,
+      existingOnWorkspaceOnly,
+      noAutoSnap,
+      noSnap,
+      snapMessage,
+      keepReadme,
+      squash,
+      noSquash,
+      tag,
+      pattern,
+      skipDependencyInstallation,
+      skipFetch,
+      resolveUnrelated: getResolveUnrelated(),
+      ignoreConfigChanges,
+      includeDeps,
+      excludeNonLaneComps,
+      detachHead,
+      loose
+    });
+    const mergeResult = (0, _merging().mergeReport)(_objectSpread(_objectSpread({}, mergeResults), {}, {
+      configMergeResults,
+      verbose
+    }));
+    const deleteOutput = `\n${deleteResults.localResult ? (0, _remove().removeTemplate)(deleteResults.localResult, false) : ''}${(deleteResults.remoteResult || []).map(item => (0, _remove().removeTemplate)(item, true))}${deleteResults.readmeResult && _chalk().default.yellow(deleteResults.readmeResult) || ''}\n`;
+    return mergeResult + deleteOutput;
+  }
+}
+exports.MergeLaneCmd = MergeLaneCmd;
+
+//# sourceMappingURL=merge-lane.cmd.js.map

package/dist/merge-lane.cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_legacy","_bitError","_remove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLaneCmd","constructor","mergeLanes","configStore","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noAutoSnap","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","detachHead","loose","getConfigBoolean","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLaneByCLI","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { mergeReport, MergeStrategy } from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy.constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\nimport { ConfigStoreMain } from '@teambit/config-store';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane to the current lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n    },\n  ];\n  alias = '';\n  options = [\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n    ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n    ['', 'workspace', 'merge only lane components that are in the current workspace'],\n    [\n      '',\n      'no-auto-snap',\n      'do not auto snap after merge completed without conflicts of diverged components (see command description)',\n    ],\n    ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'],\n    ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'loose', 'relevant for --build, to allow build to succeed even if tasks like tests or lint fail'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n    ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'display detailed information about components that were legitimately unmerged'],\n    ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n    ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n    [\n      '',\n      'include-non-lane-comps',\n      'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n    [\n      '',\n      'exclude-non-lane-comps',\n      'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n    ],\n    [\n      '',\n      'detach-head',\n      'UNSUPPORTED YET. for each component, find the divergent point from main and merge to that point. do not change the head',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(\n    private mergeLanes: MergeLanesMain,\n    private configStore: ConfigStoreMain\n  ) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours,\n      theirs,\n      manual,\n      autoMergeResolve,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noAutoSnap = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n      excludeNonLaneComps = false,\n      detachHead,\n      loose = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: string;\n      workspace?: boolean;\n      build?: boolean;\n      noAutoSnap: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n      excludeNonLaneComps?: boolean;\n      detachHead?: boolean;\n      loose?: boolean;\n    }\n  ): Promise<string> {\n    build = this.configStore.getConfigBoolean(CFG_FORCE_LOCAL_BUILD) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError(\n        'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    const mergeStrategy = autoMergeResolve;\n    if (noAutoSnap && snapMessage) throw new BitError('unable to use \"no-snap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLaneByCLI(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      ours,\n      theirs,\n      existingOnWorkspaceOnly,\n      noAutoSnap,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n      excludeNonLaneComps,\n      detachHead,\n      loose,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => removeTemplate(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteOutput;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/merge-lanes.aspect.d.ts

@@ -0,0 +1,2 @@
+import { Aspect } from '@teambit/harmony';
+export declare const MergeLanesAspect: Aspect;

package/dist/merge-lanes.aspect.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeLanesAspect = void 0;
+function _harmony() {
+  const data = require("@teambit/harmony");
+  _harmony = function () {
+    return data;
+  };
+  return data;
+}
+const MergeLanesAspect = exports.MergeLanesAspect = _harmony().Aspect.create({
+  id: 'teambit.lanes/merge-lanes'
+});
+
+//# sourceMappingURL=merge-lanes.aspect.js.map

package/dist/merge-lanes.aspect.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_harmony","data","require","MergeLanesAspect","exports","Aspect","create","id"],"sources":["merge-lanes.aspect.ts"],"sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const MergeLanesAspect = Aspect.create({\n  id: 'teambit.lanes/merge-lanes',\n});\n"],"mappings":";;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEO,MAAME,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAGE,iBAAM,CAACC,MAAM,CAAC;EAC5CC,EAAE,EAAE;AACN,CAAC,CAAC","ignoreList":[]}

package/dist/merge-lanes.main.runtime.d.ts

@@ -0,0 +1,113 @@
+import { CLIMain } from '@teambit/cli';
+import { ImporterMain } from '@teambit/importer';
+import { LanesMain } from '@teambit/lanes';
+import { MergingMain, ApplyVersionResults, MergeStrategy } from '@teambit/merging';
+import { Workspace } from '@teambit/workspace';
+import { ConfigStoreMain } from '@teambit/config-store';
+import { ComponentID } from '@teambit/component-id';
+import { ScopeMain } from '@teambit/scope';
+import { LaneId } from '@teambit/lane-id';
+import { ConfigMergeResult } from '@teambit/config-merger';
+import { Logger, LoggerMain } from '@teambit/logger';
+import { CheckoutMain, CheckoutProps } from '@teambit/checkout';
+import { RemoveMain } from '@teambit/remove';
+import { ExportMain } from '@teambit/export';
+import { MergeAbortOpts } from './merge-abort.cmd';
+import { ExpressMain } from '@teambit/express';
+export type MergeLaneOptions = {
+    mergeStrategy: MergeStrategy;
+    ours?: boolean;
+    theirs?: boolean;
+    noAutoSnap?: boolean;
+    noSnap?: boolean;
+    snapMessage?: string;
+    existingOnWorkspaceOnly?: boolean;
+    build?: boolean;
+    keepReadme?: boolean;
+    squash?: boolean;
+    noSquash?: boolean;
+    tag?: boolean;
+    pattern?: string;
+    includeDeps?: boolean;
+    skipDependencyInstallation?: boolean;
+    resolveUnrelated?: MergeStrategy;
+    ignoreConfigChanges?: boolean;
+    skipFetch?: boolean;
+    excludeNonLaneComps?: boolean;
+    shouldIncludeUpdateDependents?: boolean;
+    throwIfNotUpToDate?: boolean;
+    fetchCurrent?: boolean;
+    detachHead?: boolean;
+    loose?: boolean;
+};
+export type ConflictPerId = {
+    id: ComponentID;
+    files: string[];
+    config?: boolean;
+    configConflict?: string;
+};
+export declare class MergeLanesMain {
+    private workspace;
+    private merging;
+    readonly lanes: LanesMain;
+    readonly logger: Logger;
+    private remove;
+    private scope;
+    private exporter;
+    private importer;
+    private checkout;
+    constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain);
+    mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{
+        mergeResults: ApplyVersionResults;
+        deleteResults: any;
+        configMergeResults: ConfigMergeResult[];
+        mergedSuccessfullyIds: ComponentID[];
+        conflicts: ConflictPerId[];
+    }>;
+    /**
+     * merge otherLaneId into currentLaneId
+     */
+    mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{
+        mergeResults: ApplyVersionResults;
+        deleteResults: any;
+        configMergeResults: ConfigMergeResult[];
+        mergedSuccessfullyIds: ComponentID[];
+        conflicts: ConflictPerId[];
+    }>;
+    private validateMergeFlags;
+    private resolveMergeContext;
+    /**
+     * check conflicts in case of merging sourceLaneId into targetLaneId
+     */
+    checkLaneForConflicts(sourceLaneIdStr: string, targetLaneIdStr: string, options: Partial<MergeLaneOptions>): Promise<{
+        conflicts: ConflictPerId[];
+    }>;
+    mergeMove(newLaneName: string, options: {
+        scope?: string;
+    }): Promise<import("@teambit/lanes").CreateLaneResult>;
+    abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{
+        checkoutResults: ApplyVersionResults | undefined;
+        restoredItems: string[];
+        checkoutError: Error | undefined;
+    }>;
+    private getMainIdsToMerge;
+    private throwIfNotUpToDate;
+    static slots: never[];
+    static dependencies: import("@teambit/harmony").Aspect[];
+    static runtime: import("@teambit/harmony").RuntimeDefinition;
+    static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, configStore, express,]: [
+        LanesMain,
+        CLIMain,
+        Workspace,
+        MergingMain,
+        LoggerMain,
+        RemoveMain,
+        ScopeMain,
+        ExportMain,
+        ImporterMain,
+        CheckoutMain,
+        ConfigStoreMain,
+        ExpressMain
+    ]): Promise<MergeLanesMain>;
+}
+export default MergeLanesMain;