@teambit/merge-lanes 1.0.224 → 1.0.226

package/dist/merge-lane-from-scope.cmd.js

@@ -167,6 +167,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
         })
       };
     } catch (err) {
+      this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);
       return {
         code: 1,
         error: err.message

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_utils","_bitError","_excluded","obj","__esModule","default","_objectWithoutProperties","source","excluded","target","_objectWithoutPropertiesLoose","key","i","Object","getOwnPropertySymbols","sourceSymbolKeys","length","indexOf","prototype","propertyIsEnumerable","call","sourceKeys","keys","ownKeys","e","r","t","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy/dist/utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n    const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n    const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n          mergeSnapError: results.mergeSnapError\n            ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n            : undefined,\n        },\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_utils","_bitError","_excluded","obj","__esModule","default","_objectWithoutProperties","source","excluded","target","_objectWithoutPropertiesLoose","key","i","Object","getOwnPropertySymbols","sourceSymbolKeys","length","indexOf","prototype","propertyIsEnumerable","call","sourceKeys","keys","ownKeys","e","r","t","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy/dist/utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n    const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n    const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n          mergeSnapError: results.mergeSnapError\n            ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n            : undefined,\n        },\n      };\n    } catch (err: any) {\n      this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -33,6 +33,7 @@ export type MergeLaneOptions = {
     ignoreConfigChanges?: boolean;
     skipFetch?: boolean;
     excludeNonLaneComps?: boolean;
+    shouldIncludeUpdateDependents?: boolean;
 };
 export type MergeFromScopeResult = {
     mergedNow: ComponentID[];

package/dist/merge-lanes.main.runtime.js

@@ -137,13 +137,6 @@ function _globalConfig() {
   };
   return data;
 }
-function _getDivergeData() {
-  const data = require("@teambit/legacy/dist/scope/component-ops/get-diverge-data");
-  _getDivergeData = function () {
-    return data;
-  };
-  return data;
-}
 function _mergeLanes() {
   const data = require("./merge-lanes.aspect");
   _mergeLanes = function () {
@@ -232,7 +225,8 @@ class MergeLanesMain {
       resolveUnrelated,
       ignoreConfigChanges,
       skipFetch,
-      excludeNonLaneComps
+      excludeNonLaneComps,
+      shouldIncludeUpdateDependents
     } = options;
     const legacyScope = this.scope.legacyScope;
     if (tag && !currentLaneId.isDefault()) {
@@ -276,7 +270,7 @@ class MergeLanesMain {
         }));
       }
       if (!otherLane) throw new Error(`lane must be defined for non-default`);
-      return otherLane.toBitIds();
+      return shouldIncludeUpdateDependents ? otherLane.toComponentIdsIncludeUpdateDependents() : otherLane.toComponentIds();
     };
     const idsToMerge = await getBitIds();
     this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);
@@ -317,7 +311,7 @@ class MergeLanesMain {
     }
     (0, _checkout().throwForFailures)(allComponentsStatus);
     if (shouldSquash) {
-      await squashSnaps(allComponentsStatus, currentLaneId, otherLaneId, legacyScope);
+      await squashSnaps(allComponentsStatus, currentLaneId, otherLaneId, legacyScope, options.snapMessage);
     }
     if (laneToFetchArtifactsFrom) {
       const ids = allComponentsStatus.map(c => c.id);
@@ -421,7 +415,7 @@ class MergeLanesMain {
     const getIdsToMerge = async () => {
       if (!options.pattern) return laneIds;
       const ids = await this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneIds);
-      return _componentId().ComponentIdList.fromArray(ids.map(id => id));
+      return _componentId().ComponentIdList.fromArray(ids);
     };
     const idsToMerge = await getIdsToMerge();
     const scopeComponentsImporter = this.scope.legacyScope.scopeImporter;
@@ -470,116 +464,60 @@ class MergeLanesMain {
       });
       return exported;
     };
-    if (fromLaneId.isDefault()) {
-      // current -> target (to)
-      // other -> source (from)
-      options.mergeStrategy = 'manual';
-      options.excludeNonLaneComps = true;
-      options.skipDependencyInstallation = true;
-      this.scope.legacyScope.setCurrentLaneId(toLaneId);
-      // this causes issues when merging main to a lane as it fetches from the lane instead of from main.
-      // see the e2e-test: "main to lane and multiple scopes when a main-version is missing from lane-scope"
-      // this.scope.legacyScope.scopeImporter.shouldOnlyFetchFromCurrentLane = true;
+    if (!fromLaneId.isDefault()) {
+      await this.throwIfNotUpToDate(fromLaneId, toLaneId);
+    }
 
-      const result = await this.mergeLane(fromLaneId, toLaneId, options);
-      const {
-        mergeSnapResults,
-        leftUnresolvedConflicts,
-        failedComponents,
-        components,
-        mergeSnapError
-      } = result.mergeResults;
-      this.logger.debug(`found the following config conflicts: ${result.configMergeResults.map(c => `\n${c.compIdStr}\n${c.generateMergeConflictFile()}`).join('\n')}`);
-      const componentsWithConfigConflicts = result.configMergeResults.filter(c => c.hasConflicts()).map(c => c.compIdStr);
-      const conflicts = [];
-      const merged = [];
-      components?.forEach(c => {
-        const files = Object.keys(c.filesStatus).filter(f => c.filesStatus[f] === _mergeVersion().FileStatus.manual || c.filesStatus[f] === _mergeVersion().FileStatus.binaryConflict);
-        const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());
-        if (files.length || config) {
-          conflicts.push({
-            id: c.id,
-            files,
-            config
-          });
-        } else merged.push(c.id);
-      });
-      const snappedIds = mergeSnapResults?.snappedComponents.map(c => c.id) || [];
-      const laneToExport = await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed
-      const exportedIds = leftUnresolvedConflicts || mergeSnapError ? [] : await exportIfNeeded(idsToMerge.map(id => id.changeVersion(undefined)), laneToExport);
-      return {
-        mergedNow: merged,
-        mergedPreviously: failedComponents?.filter(({
-          unchangedMessage
-        }) => unchangedMessage === _merging().compIsAlreadyMergedMsg).map(c => c.id) || [],
-        exportedIds,
-        unmerged: failedComponents?.map(c => ({
+    // current -> target (to)
+    // other -> source (from)
+    options.mergeStrategy = 'manual';
+    options.excludeNonLaneComps = true;
+    options.skipDependencyInstallation = true;
+    options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;
+    this.scope.legacyScope.setCurrentLaneId(toLaneId);
+    // this causes issues when merging main to a lane as it fetches from the lane instead of from main.
+    // see the e2e-test: "main to lane and multiple scopes when a main-version is missing from lane-scope"
+    // this.scope.legacyScope.scopeImporter.shouldOnlyFetchFromCurrentLane = true;
+
+    const result = await this.mergeLane(fromLaneId, toLaneId, options);
+    const {
+      mergeSnapResults,
+      leftUnresolvedConflicts,
+      failedComponents,
+      components,
+      mergeSnapError
+    } = result.mergeResults;
+    this.logger.debug(`found the following config conflicts: ${result.configMergeResults.map(c => `\n${c.compIdStr}\n${c.generateMergeConflictFile()}`).join('\n')}`);
+    const componentsWithConfigConflicts = result.configMergeResults.filter(c => c.hasConflicts()).map(c => c.compIdStr);
+    const conflicts = [];
+    const merged = [];
+    components?.forEach(c => {
+      const files = Object.keys(c.filesStatus).filter(f => c.filesStatus[f] === _mergeVersion().FileStatus.manual || c.filesStatus[f] === _mergeVersion().FileStatus.binaryConflict);
+      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());
+      if (files.length || config) {
+        conflicts.push({
           id: c.id,
-          reason: c.unchangedMessage
-        })) || [],
-        conflicts,
-        snappedIds,
-        mergeSnapError
-      };
-    }
-    await this.throwIfNotUpToDate(fromLaneId, toLaneId);
-    const repo = this.scope.legacyScope.objects;
-    // loop through all components, make sure they're all ahead of main (it might not be on main yet).
-    // then, change the version object to include an extra parent to point to the main.
-    // then, change the component object head to point to this changed version
-    const mergedPreviously = [];
-    const mergedNow = [];
-    const log = await getLogForSquash(fromLaneId);
-    const bitObjectsPerComp = await (0, _pMapSeries().default)(idsToMerge, async id => {
-      const modelComponent = await this.scope.legacyScope.getModelComponent(id);
-      const fromVersionObj = await modelComponent.loadVersion(id.version, repo);
-      if (fromVersionObj.isRemoved()) return undefined;
-      const fromLaneHead = modelComponent.getRef(id.version);
-      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);
-      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;
-      if (toLaneHead?.isEqual(fromLaneHead) && !options.reMerge) {
-        mergedPreviously.push(id);
-        return undefined;
-      }
-      const divergeData = await (0, _getDivergeData().getDivergeData)({
-        repo,
-        modelComponent,
-        sourceHead: toLaneHead,
-        targetHead: fromLaneHead,
-        throwForNoCommonSnap: true
-      });
-      const modifiedVersion = shouldSquash ? await squashOneComp(_laneId().DEFAULT_LANE, fromLaneId, id, divergeData, log, this.scope.legacyScope, fromVersionObj, options.snapMessage) : undefined;
-      const objects = [];
-      if (modifiedVersion) objects.push(modifiedVersion);
-      if (toLaneObj) {
-        toLaneObj.addComponent({
-          id: id.changeVersion(undefined),
-          head: fromLaneHead
+          files,
+          config
         });
-      } else {
-        modelComponent.setHead(fromLaneHead);
-        objects.push(modelComponent);
-      }
-      mergedNow.push(id);
-      return {
-        id,
-        objects
-      };
+      } else merged.push(c.id);
     });
-    const bitObjects = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.objects);
-    const bitObjectsFlat = bitObjects.flat();
-    if (toLaneObj) bitObjectsFlat.push(toLaneObj);
-    await repo.writeObjectsToTheFS(bitObjectsFlat);
-    const ids = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.id);
-    const exportedIds = await exportIfNeeded(ids, toLaneObj);
+    const snappedIds = mergeSnapResults?.snappedComponents.map(c => c.id) || [];
+    const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed
+    const exportedIds = leftUnresolvedConflicts || mergeSnapError ? [] : await exportIfNeeded(idsToMerge.map(id => id.changeVersion(undefined)), laneToExport || undefined);
     return {
-      mergedPreviously,
-      mergedNow,
+      mergedNow: merged,
+      mergedPreviously: failedComponents?.filter(({
+        unchangedMessage
+      }) => unchangedMessage === _merging().compIsAlreadyMergedMsg).map(c => c.id) || [],
       exportedIds,
-      unmerged: mergedPreviously.map(id => ({
-        id,
-        reason: 'already merged'
-      }))
+      unmerged: failedComponents?.map(c => ({
+        id: c.id,
+        reason: c.unchangedMessage
+      })) || [],
+      conflicts,
+      snappedIds,
+      mergeSnapError
     };
   }
   async throwIfNotUpToDate(fromLaneId, toLaneId) {
@@ -723,7 +661,7 @@ async function getLogForSquash(otherLaneId) {
   });
   return log;
 }
-async function squashSnaps(allComponentsStatus, currentLaneId, otherLaneId, scope) {
+async function squashSnaps(allComponentsStatus, currentLaneId, otherLaneId, scope, messageTitle) {
   const currentLaneName = currentLaneId.name;
   const succeededComponents = allComponentsStatus.filter(c => !c.unchangedMessage);
   const log = await getLogForSquash(otherLaneId);
@@ -735,7 +673,7 @@ async function squashSnaps(allComponentsStatus, currentLaneId, otherLaneId, scop
     if (!divergeData) {
       throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);
     }
-    const modifiedComp = await squashOneComp(currentLaneName, otherLaneId, id, divergeData, log, scope, componentFromModel);
+    const modifiedComp = await squashOneComp(currentLaneName, otherLaneId, id, divergeData, log, scope, componentFromModel, messageTitle);
     if (modifiedComp) {
       scope.objects.add(modifiedComp);
       const modelComponent = await scope.getModelComponent(id);