npm - @teambit/merging - Versions diffs - 1.0.483 → 1.0.485 - Mend

@teambit/merging 1.0.483 → 1.0.485

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 (7) hide show

package/artifacts/__bit_junit.xml +1 -1
package/artifacts/schema.json +713 -521
package/dist/merging.main.runtime.d.ts +6 -0
package/dist/merging.main.runtime.js +21 -4
package/dist/merging.main.runtime.js.map +1 -1
package/package.json +19 -19
/package/dist/{preview-1733196057323.js → preview-1733455199677.js} +0 -0

package/artifacts/schema.json CHANGED Viewed

@@ -1373,7 +1373,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -1626,7 +1626,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -1860,7 +1860,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -1937,7 +1937,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -2580,7 +2580,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 113,
+            "line": 115,
             "character": 1
           },
           "signature": "class MergingMain",
@@ -2590,7 +2590,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 114,
+                "line": 116,
                 "character": 3
               },
               "signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain): MergingMain",
@@ -2600,7 +2600,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 115,
+                    "line": 117,
                     "character": 5
                   },
                   "name": "workspace",
@@ -2608,7 +2608,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 115,
+                      "line": 117,
                       "character": 24
                     },
                     "name": "Workspace"
@@ -2620,7 +2620,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 116,
+                    "line": 118,
                     "character": 5
                   },
                   "name": "scope",
@@ -2628,7 +2628,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 116,
+                      "line": 118,
                       "character": 20
                     },
                     "name": "ScopeMain"
@@ -2640,7 +2640,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 117,
+                    "line": 119,
                     "character": 5
                   },
                   "name": "install",
@@ -2648,7 +2648,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 117,
+                      "line": 119,
                       "character": 22
                     },
                     "name": "InstallMain"
@@ -2660,7 +2660,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 118,
+                    "line": 120,
                     "character": 5
                   },
                   "name": "snapping",
@@ -2668,7 +2668,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 118,
+                      "line": 120,
                       "character": 23
                     },
                     "name": "SnappingMain"
@@ -2680,7 +2680,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 119,
+                    "line": 121,
                     "character": 5
                   },
                   "name": "checkout",
@@ -2688,7 +2688,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 119,
+                      "line": 121,
                       "character": 23
                     },
                     "name": "CheckoutMain"
@@ -2700,7 +2700,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 120,
+                    "line": 122,
                     "character": 5
                   },
                   "name": "logger",
@@ -2708,7 +2708,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 120,
+                      "line": 122,
                       "character": 21
                     },
                     "name": "Logger"
@@ -2720,7 +2720,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 121,
+                    "line": 123,
                     "character": 5
                   },
                   "name": "componentWriter",
@@ -2728,7 +2728,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 121,
+                      "line": 123,
                       "character": 30
                     },
                     "name": "ComponentWriterMain"
@@ -2740,7 +2740,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 122,
+                    "line": 124,
                     "character": 5
                   },
                   "name": "importer",
@@ -2748,7 +2748,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 122,
+                      "line": 124,
                       "character": 23
                     },
                     "name": "ImporterMain"
@@ -2760,7 +2760,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 123,
+                    "line": 125,
                     "character": 5
                   },
                   "name": "config",
@@ -2768,7 +2768,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 123,
+                      "line": 125,
                       "character": 21
                     },
                     "name": "ConfigMain"
@@ -2780,7 +2780,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 124,
+                    "line": 126,
                     "character": 5
                   },
                   "name": "remove",
@@ -2788,7 +2788,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 124,
+                      "line": 126,
                       "character": 21
                     },
                     "name": "RemoveMain"
@@ -2800,7 +2800,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 125,
+                    "line": 127,
                     "character": 5
                   },
                   "name": "configMerger",
@@ -2808,7 +2808,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 125,
+                      "line": 127,
                       "character": 27
                     },
                     "name": "ConfigMergerMain"
@@ -2820,7 +2820,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 126,
+                    "line": 128,
                     "character": 5
                   },
                   "name": "depResolver",
@@ -2828,7 +2828,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 126,
+                      "line": 128,
                       "character": 26
                     },
                     "name": "DependencyResolverMain"
@@ -2841,7 +2841,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 113,
+                  "line": 115,
                   "character": 1
                 },
                 "name": "MergingMain"
@@ -2852,7 +2852,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 129,
+                "line": 131,
                 "character": 3
               },
               "signature": "(method) MergingMain.merge(pattern: string, mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noAutoSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
@@ -2862,7 +2862,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 130,
+                    "line": 132,
                     "character": 5
                   },
                   "name": "pattern",
@@ -2870,7 +2870,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 130,
+                      "line": 132,
                       "character": 14
                     },
                     "name": "string"
@@ -2882,7 +2882,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 131,
+                    "line": 133,
                     "character": 5
                   },
                   "name": "mergeStrategy",
@@ -2890,7 +2890,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 131,
+                      "line": 133,
                       "character": 20
                     },
                     "name": "MergeStrategy"
@@ -2902,7 +2902,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 132,
+                    "line": 134,
                     "character": 5
                   },
                   "name": "abort",
@@ -2910,7 +2910,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 132,
+                      "line": 134,
                       "character": 12
                     },
                     "name": "boolean"
@@ -2922,7 +2922,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 133,
+                    "line": 135,
                     "character": 5
                   },
                   "name": "resolve",
@@ -2930,7 +2930,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 133,
+                      "line": 135,
                       "character": 14
                     },
                     "name": "boolean"
@@ -2942,7 +2942,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 134,
+                    "line": 136,
                     "character": 5
                   },
                   "name": "noAutoSnap",
@@ -2950,7 +2950,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 134,
+                      "line": 136,
                       "character": 17
                     },
                     "name": "boolean"
@@ -2962,7 +2962,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 135,
+                    "line": 137,
                     "character": 5
                   },
                   "name": "message",
@@ -2970,7 +2970,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 135,
+                      "line": 137,
                       "character": 14
                     },
                     "name": "string"
@@ -2982,7 +2982,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 136,
+                    "line": 138,
                     "character": 5
                   },
                   "name": "build",
@@ -2990,7 +2990,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 136,
+                      "line": 138,
                       "character": 12
                     },
                     "name": "boolean"
@@ -3002,7 +3002,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 137,
+                    "line": 139,
                     "character": 5
                   },
                   "name": "skipDependencyInstallation",
@@ -3010,7 +3010,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 137,
+                      "line": 139,
                       "character": 33
                     },
                     "name": "boolean"
@@ -3023,7 +3023,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 138,
+                  "line": 140,
                   "character": 6
                 },
                 "name": "Promise",
@@ -3032,7 +3032,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 138,
+                      "line": 140,
                       "character": 14
                     },
                     "name": "ApplyVersionResults"
@@ -3047,14 +3047,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 166,
+                "line": 168,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 162,
+                  "line": 164,
                   "character": 3
                 },
                 "raw": "/**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */",
@@ -3068,7 +3068,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 167,
+                    "line": 169,
                     "character": 5
                   },
                   "name": "consumer",
@@ -3076,7 +3076,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 167,
+                      "line": 169,
                       "character": 15
                     },
                     "name": "Consumer"
@@ -3088,7 +3088,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 168,
+                    "line": 170,
                     "character": 5
                   },
                   "name": "bitIds",
@@ -3096,14 +3096,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 168,
+                      "line": 170,
                       "character": 13
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 168,
+                        "line": 170,
                         "character": 13
                       },
                       "name": "ComponentID"
@@ -3116,7 +3116,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 169,
+                    "line": 171,
                     "character": 5
                   },
                   "name": "mergeStrategy",
@@ -3124,7 +3124,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 169,
+                      "line": 171,
                       "character": 20
                     },
                     "name": "MergeStrategy"
@@ -3136,7 +3136,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 170,
+                    "line": 172,
                     "character": 5
                   },
                   "name": "noAutoSnap",
@@ -3144,7 +3144,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 170,
+                      "line": 172,
                       "character": 17
                     },
                     "name": "boolean"
@@ -3156,7 +3156,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 171,
+                    "line": 173,
                     "character": 5
                   },
                   "name": "snapMessage",
@@ -3164,7 +3164,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 171,
+                      "line": 173,
                       "character": 18
                     },
                     "name": "string"
@@ -3176,7 +3176,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 172,
+                    "line": 174,
                     "character": 5
                   },
                   "name": "build",
@@ -3184,7 +3184,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 172,
+                      "line": 174,
                       "character": 12
                     },
                     "name": "boolean"
@@ -3196,7 +3196,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 173,
+                    "line": 175,
                     "character": 5
                   },
                   "name": "skipDependencyInstallation",
@@ -3204,7 +3204,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 173,
+                      "line": 175,
                       "character": 33
                     },
                     "name": "boolean"
@@ -3217,7 +3217,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 174,
+                  "line": 176,
                   "character": 6
                 },
                 "name": "Promise",
@@ -3226,7 +3226,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 174,
+                      "line": 176,
                       "character": 14
                     },
                     "name": "ApplyVersionResults"
@@ -3241,14 +3241,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 209,
+                "line": 211,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 206,
+                  "line": 208,
                   "character": 3
                 },
                 "raw": "/**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */",
@@ -3262,7 +3262,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 209,
+                    "line": 211,
                     "character": 20
                   },
                   "name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noAutoSnap, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
@@ -3270,7 +3270,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 220,
+                      "line": 222,
                       "character": 6
                     },
                     "members": [
@@ -3278,7 +3278,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 221,
+                          "line": 223,
                           "character": 5
                         },
                         "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -3287,7 +3287,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 221,
+                            "line": 223,
                             "character": 20
                           },
                           "name": "MergeStrategy"
@@ -3298,7 +3298,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 222,
+                          "line": 224,
                           "character": 5
                         },
                         "signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
@@ -3307,14 +3307,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 222,
+                            "line": 224,
                             "character": 26
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merging.main.runtime.ts",
-                              "line": 222,
+                              "line": 224,
                               "character": 26
                             },
                             "name": "ComponentMergeStatus"
@@ -3326,7 +3326,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 223,
+                          "line": 225,
                           "character": 5
                         },
                         "signature": "(property) otherLaneId: LaneId",
@@ -3335,7 +3335,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 223,
+                            "line": 225,
                             "character": 5
                           },
                           "name": "LaneId",
@@ -3351,7 +3351,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 224,
+                          "line": 226,
                           "character": 5
                         },
                         "signature": "(property) currentLane?: Lane | undefined",
@@ -3360,7 +3360,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 224,
+                            "line": 226,
                             "character": 19
                           },
                           "name": "Lane"
@@ -3371,7 +3371,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 225,
+                          "line": 227,
                           "character": 5
                         },
                         "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -3380,7 +3380,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 225,
+                            "line": 227,
                             "character": 18
                           },
                           "name": "boolean"
@@ -3391,7 +3391,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 226,
+                          "line": 228,
                           "character": 5
                         },
                         "signature": "(property) noSnap?: boolean | undefined",
@@ -3400,7 +3400,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 226,
+                            "line": 228,
                             "character": 14
                           },
                           "name": "boolean"
@@ -3411,7 +3411,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 227,
+                          "line": 229,
                           "character": 5
                         },
                         "signature": "(property) tag?: boolean | undefined",
@@ -3420,7 +3420,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 227,
+                            "line": 229,
                             "character": 11
                           },
                           "name": "boolean"
@@ -3431,7 +3431,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 228,
+                          "line": 230,
                           "character": 5
                         },
                         "signature": "(property) snapMessage?: string | undefined",
@@ -3440,7 +3440,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 228,
+                            "line": 230,
                             "character": 19
                           },
                           "name": "string"
@@ -3451,7 +3451,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 229,
+                          "line": 231,
                           "character": 5
                         },
                         "signature": "(property) build?: boolean | undefined",
@@ -3460,7 +3460,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 229,
+                            "line": 231,
                             "character": 13
                           },
                           "name": "boolean"
@@ -3471,7 +3471,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 230,
+                          "line": 232,
                           "character": 5
                         },
                         "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -3480,7 +3480,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 230,
+                            "line": 232,
                             "character": 34
                           },
                           "name": "boolean"
@@ -3495,7 +3495,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 221,
+                        "line": 223,
                         "character": 5
                       },
                       "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -3504,7 +3504,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 221,
+                          "line": 223,
                           "character": 20
                         },
                         "name": "MergeStrategy"
@@ -3515,7 +3515,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 222,
+                        "line": 224,
                         "character": 5
                       },
                       "signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
@@ -3524,14 +3524,14 @@
                         "__schema": "TypeArraySchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 222,
+                          "line": 224,
                           "character": 26
                         },
                         "type": {
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 222,
+                            "line": 224,
                             "character": 26
                           },
                           "name": "ComponentMergeStatus"
@@ -3543,7 +3543,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 223,
+                        "line": 225,
                         "character": 5
                       },
                       "signature": "(property) otherLaneId: LaneId",
@@ -3552,7 +3552,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 223,
+                          "line": 225,
                           "character": 5
                         },
                         "name": "LaneId",
@@ -3568,7 +3568,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 224,
+                        "line": 226,
                         "character": 5
                       },
                       "signature": "(property) currentLane?: Lane | undefined",
@@ -3577,7 +3577,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 224,
+                          "line": 226,
                           "character": 19
                         },
                         "name": "Lane"
@@ -3588,7 +3588,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 225,
+                        "line": 227,
                         "character": 5
                       },
                       "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -3597,7 +3597,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 225,
+                          "line": 227,
                           "character": 18
                         },
                         "name": "boolean"
@@ -3608,7 +3608,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 226,
+                        "line": 228,
                         "character": 5
                       },
                       "signature": "(property) noSnap?: boolean | undefined",
@@ -3617,7 +3617,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 226,
+                          "line": 228,
                           "character": 14
                         },
                         "name": "boolean"
@@ -3628,7 +3628,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 227,
+                        "line": 229,
                         "character": 5
                       },
                       "signature": "(property) tag?: boolean | undefined",
@@ -3637,7 +3637,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 227,
+                          "line": 229,
                           "character": 11
                         },
                         "name": "boolean"
@@ -3648,7 +3648,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 228,
+                        "line": 230,
                         "character": 5
                       },
                       "signature": "(property) snapMessage?: string | undefined",
@@ -3657,7 +3657,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 228,
+                          "line": 230,
                           "character": 19
                         },
                         "name": "string"
@@ -3668,7 +3668,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 229,
+                        "line": 231,
                         "character": 5
                       },
                       "signature": "(property) build?: boolean | undefined",
@@ -3677,7 +3677,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 229,
+                          "line": 231,
                           "character": 13
                         },
                         "name": "boolean"
@@ -3688,7 +3688,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 230,
+                        "line": 232,
                         "character": 5
                       },
                       "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -3697,7 +3697,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 230,
+                          "line": 232,
                           "character": 34
                         },
                         "name": "boolean"
@@ -3712,7 +3712,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 231,
+                  "line": 233,
                   "character": 7
                 },
                 "name": "Promise",
@@ -3721,7 +3721,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 231,
+                      "line": 233,
                       "character": 15
                     },
                     "name": "ApplyVersionResults"
@@ -3736,7 +3736,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 353,
+                "line": 355,
                 "character": 3
               },
               "signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
@@ -3746,7 +3746,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 354,
+                    "line": 356,
                     "character": 5
                   },
                   "name": "componentsResults",
@@ -3754,14 +3754,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 354,
+                      "line": 356,
                       "character": 24
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 354,
+                        "line": 356,
                         "character": 24
                       },
                       "name": "ApplyVersionWithComps"
@@ -3774,7 +3774,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 355,
+                    "line": 357,
                     "character": 5
                   },
                   "name": "currentLane",
@@ -3782,7 +3782,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 355,
+                      "line": 357,
                       "character": 19
                     },
                     "name": "Lane"
@@ -3794,7 +3794,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 356,
+                    "line": 358,
                     "character": 5
                   },
                   "name": "currentLaneIdsBeforeMerge",
@@ -3802,7 +3802,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 356,
+                      "line": 358,
                       "character": 33
                     },
                     "name": "ComponentIdList"
@@ -3815,7 +3815,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 353,
+                  "line": 355,
                   "character": 3
                 },
                 "type": "Promise<void>"
@@ -3828,14 +3828,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 378,
+                "line": 380,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 372,
+                  "line": 374,
                   "character": 3
                 },
                 "raw": "/**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */",
@@ -3849,7 +3849,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 379,
+                    "line": 381,
                     "character": 5
                   },
                   "name": "bitIds",
@@ -3857,14 +3857,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 379,
+                      "line": 381,
                       "character": 13
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 379,
+                        "line": 381,
                         "character": 13
                       },
                       "name": "ComponentID"
@@ -3877,7 +3877,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 380,
+                    "line": 382,
                     "character": 5
                   },
                   "name": "options",
@@ -3885,7 +3885,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 380,
+                      "line": 382,
                       "character": 14
                     },
                     "name": "MergeStatusProviderOptions"
@@ -3897,7 +3897,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 381,
+                    "line": 383,
                     "character": 5
                   },
                   "name": "currentLane",
@@ -3905,7 +3905,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 381,
+                      "line": 383,
                       "character": 19
                     },
                     "name": "Lane"
@@ -3917,7 +3917,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 382,
+                    "line": 384,
                     "character": 5
                   },
                   "name": "otherLane",
@@ -3925,7 +3925,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 382,
+                      "line": 384,
                       "character": 17
                     },
                     "name": "Lane"
@@ -3938,7 +3938,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 383,
+                  "line": 385,
                   "character": 6
                 },
                 "name": "Promise",
@@ -3947,14 +3947,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 383,
+                      "line": 385,
                       "character": 14
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 383,
+                        "line": 385,
                         "character": 14
                       },
                       "name": "ComponentMergeStatus"
@@ -3966,11 +3966,74 @@
                 "async"
               ]
             },
+            {
+              "__schema": "FunctionLikeSchema",
+              "location": {
+                "filePath": "merging.main.runtime.ts",
+                "line": 677,
+                "character": 3
+              },
+              "signature": "(method) MergingMain.listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]>",
+              "name": "listMergePendingComponents",
+              "params": [
+                {
+                  "__schema": "ParameterSchema",
+                  "location": {
+                    "filePath": "merging.main.runtime.ts",
+                    "line": 677,
+                    "character": 36
+                  },
+                  "name": "componentsList",
+                  "type": {
+                    "__schema": "TypeRefSchema",
+                    "location": {
+                      "filePath": "merging.main.runtime.ts",
+                      "line": 677,
+                      "character": 53
+                    },
+                    "name": "ComponentsList"
+                  },
+                  "isOptional": true,
+                  "isSpread": false
+                }
+              ],
+              "returnType": {
+                "__schema": "TypeRefSchema",
+                "location": {
+                  "filePath": "merging.main.runtime.ts",
+                  "line": 677,
+                  "character": 70
+                },
+                "name": "Promise",
+                "typeArgs": [
+                  {
+                    "__schema": "TypeArraySchema",
+                    "location": {
+                      "filePath": "merging.main.runtime.ts",
+                      "line": 677,
+                      "character": 78
+                    },
+                    "type": {
+                      "__schema": "TypeRefSchema",
+                      "location": {
+                        "filePath": "merging.main.runtime.ts",
+                        "line": 677,
+                        "character": 78
+                      },
+                      "name": "DivergedComponent"
+                    }
+                  }
+                ]
+              },
+              "modifiers": [
+                "async"
+              ]
+            },
             {
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 676,
+                "line": 695,
                 "character": 3
               },
               "signature": "(property) MergingMain.slots: never[]",
@@ -3979,7 +4042,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 676,
+                  "line": 695,
                   "character": 3
                 },
                 "type": "never[]"
@@ -3991,7 +4054,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 677,
+                "line": 696,
                 "character": 3
               },
               "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -4000,7 +4063,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 677,
+                  "line": 696,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -4012,7 +4075,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 693,
+                "line": 712,
                 "character": 3
               },
               "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -4021,7 +4084,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 693,
+                  "line": 712,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -4033,7 +4096,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 694,
+                "line": 713,
                 "character": 3
               },
               "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\n    CLIMain,\n    Workspace,\n    ScopeMain,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain,\n    ConfigMergerMain,\n    DependencyResolverMain\n]): Promise<MergingMain>",
@@ -4043,7 +4106,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 694,
+                    "line": 713,
                     "character": 25
                   },
                   "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
@@ -4051,7 +4114,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 709,
+                      "line": 728,
                       "character": 6
                     },
                     "elements": [
@@ -4059,7 +4122,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 710,
+                          "line": 729,
                           "character": 5
                         },
                         "name": "CLIMain"
@@ -4068,7 +4131,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 711,
+                          "line": 730,
                           "character": 5
                         },
                         "name": "Workspace"
@@ -4077,7 +4140,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 712,
+                          "line": 731,
                           "character": 5
                         },
                         "name": "ScopeMain"
@@ -4086,7 +4149,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 713,
+                          "line": 732,
                           "character": 5
                         },
                         "name": "SnappingMain"
@@ -4095,7 +4158,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 714,
+                          "line": 733,
                           "character": 5
                         },
                         "name": "CheckoutMain"
@@ -4104,7 +4167,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 715,
+                          "line": 734,
                           "character": 5
                         },
                         "name": "InstallMain"
@@ -4113,7 +4176,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 716,
+                          "line": 735,
                           "character": 5
                         },
                         "name": "LoggerMain"
@@ -4122,7 +4185,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 717,
+                          "line": 736,
                           "character": 5
                         },
                         "name": "ComponentWriterMain"
@@ -4131,7 +4194,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 718,
+                          "line": 737,
                           "character": 5
                         },
                         "name": "ImporterMain"
@@ -4140,7 +4203,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 719,
+                          "line": 738,
                           "character": 5
                         },
                         "name": "ConfigMain"
@@ -4149,7 +4212,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 720,
+                          "line": 739,
                           "character": 5
                         },
                         "name": "RemoveMain"
@@ -4158,7 +4221,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 721,
+                          "line": 740,
                           "character": 5
                         },
                         "name": "GlobalConfigMain"
@@ -4167,7 +4230,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 722,
+                          "line": 741,
                           "character": 5
                         },
                         "name": "ConfigMergerMain"
@@ -4176,7 +4239,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 723,
+                          "line": 742,
                           "character": 5
                         },
                         "name": "DependencyResolverMain"
@@ -4191,7 +4254,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 694,
+                  "line": 713,
                   "character": 3
                 },
                 "type": "Promise<MergingMain>"
@@ -4219,7 +4282,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 62,
+            "line": 64,
             "character": 1
           },
           "signature": "type ComponentMergeStatus = ComponentStatusBase & {\n    mergeResults?: MergeResultsThreeWay | null | undefined;\n    divergeData?: SnapsDistance | undefined;\n    resolvedUnrelated?: ResolveUnrelatedData | undefined;\n    configMergeResult?: ConfigMergeResult | undefined;\n}",
@@ -4228,7 +4291,7 @@
             "__schema": "TypeIntersectionSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 62,
+              "line": 64,
               "character": 36
             },
             "types": [
@@ -4236,7 +4299,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 62,
+                  "line": 64,
                   "character": 36
                 },
                 "name": "ComponentStatusBase"
@@ -4245,7 +4308,7 @@
                 "__schema": "TypeLiteralSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 62,
+                  "line": 64,
                   "character": 58
                 },
                 "members": [
@@ -4253,7 +4316,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 63,
+                      "line": 65,
                       "character": 3
                     },
                     "signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
@@ -4262,7 +4325,7 @@
                       "__schema": "TypeUnionSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 63,
+                        "line": 65,
                         "character": 18
                       },
                       "types": [
@@ -4270,7 +4333,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 63,
+                            "line": 65,
                             "character": 18
                           },
                           "name": "MergeResultsThreeWay"
@@ -4279,7 +4342,7 @@
                           "__schema": "LiteralTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 63,
+                            "line": 65,
                             "character": 41
                           },
                           "name": "null"
@@ -4292,7 +4355,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 64,
+                      "line": 66,
                       "character": 3
                     },
                     "signature": "(property) divergeData?: SnapsDistance | undefined",
@@ -4301,7 +4364,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 64,
+                        "line": 66,
                         "character": 17
                       },
                       "name": "SnapsDistance"
@@ -4312,7 +4375,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 65,
+                      "line": 67,
                       "character": 3
                     },
                     "signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
@@ -4321,7 +4384,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 65,
+                        "line": 67,
                         "character": 23
                       },
                       "name": "ResolveUnrelatedData"
@@ -4332,7 +4395,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 66,
+                      "line": 68,
                       "character": 3
                     },
                     "signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
@@ -4341,7 +4404,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 66,
+                        "line": 68,
                         "character": 23
                       },
                       "name": "ConfigMergeResult"
@@ -4367,7 +4430,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 93,
+            "line": 95,
             "character": 1
           },
           "signature": "type ApplyVersionResults = {\n    components?: ApplyVersionResult[] | undefined;\n    version?: string | undefined;\n    failedComponents?: FailedComponents[] | undefined;\n    removedComponents?: ComponentID[] | undefined;\n    ... 12 more ...;\n    workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
@@ -4376,7 +4439,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 93,
+              "line": 95,
               "character": 35
             },
             "members": [
@@ -4384,7 +4447,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 94,
+                  "line": 96,
                   "character": 3
                 },
                 "signature": "(property) components?: ApplyVersionResult[] | undefined",
@@ -4393,14 +4456,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 94,
+                    "line": 96,
                     "character": 16
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 94,
+                      "line": 96,
                       "character": 16
                     },
                     "name": "ApplyVersionResult"
@@ -4412,7 +4475,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 95,
+                  "line": 97,
                   "character": 3
                 },
                 "signature": "(property) version?: string | undefined",
@@ -4421,7 +4484,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 95,
+                    "line": 97,
                     "character": 13
                   },
                   "name": "string"
@@ -4432,7 +4495,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 96,
+                  "line": 98,
                   "character": 3
                 },
                 "signature": "(property) failedComponents?: FailedComponents[] | undefined",
@@ -4441,14 +4504,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 96,
+                    "line": 98,
                     "character": 22
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 96,
+                      "line": 98,
                       "character": 22
                     },
                     "name": "FailedComponents"
@@ -4460,7 +4523,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 97,
+                  "line": 99,
                   "character": 3
                 },
                 "signature": "(property) removedComponents?: ComponentID[] | undefined",
@@ -4469,14 +4532,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 97,
+                    "line": 99,
                     "character": 23
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 97,
+                      "line": 99,
                       "character": 23
                     },
                     "name": "ComponentID"
@@ -4488,7 +4551,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 98,
+                  "line": 100,
                   "character": 3
                 },
                 "signature": "(property) addedComponents?: ComponentID[] | undefined",
@@ -4497,14 +4560,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 98,
+                    "line": 100,
                     "character": 21
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 98,
+                      "line": 100,
                       "character": 21
                     },
                     "name": "ComponentID"
@@ -4516,7 +4579,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 99,
+                  "line": 101,
                   "character": 3
                 },
                 "signature": "(property) newComponents?: ComponentID[] | undefined",
@@ -4525,14 +4588,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 99,
+                    "line": 101,
                     "character": 19
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 99,
+                      "line": 101,
                       "character": 19
                     },
                     "name": "ComponentID"
@@ -4544,7 +4607,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 100,
+                  "line": 102,
                   "character": 3
                 },
                 "signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
@@ -4553,14 +4616,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 100,
+                    "line": 102,
                     "character": 24
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 100,
+                      "line": 102,
                       "character": 24
                     },
                     "name": "ConsumerComponent"
@@ -4572,7 +4635,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 101,
+                  "line": 103,
                   "character": 3
                 },
                 "signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
@@ -4581,14 +4644,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 101,
+                    "line": 103,
                     "character": 23
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 101,
+                      "line": 103,
                       "character": 23
                     },
                     "name": "ApplyVersionResult"
@@ -4600,7 +4663,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 102,
+                  "line": 104,
                   "character": 3
                 },
                 "signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
@@ -4609,7 +4672,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 102,
+                    "line": 104,
                     "character": 22
                   },
                   "name": "MergeSnapResults"
@@ -4620,7 +4683,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 103,
+                  "line": 105,
                   "character": 3
                 },
                 "signature": "(property) mergeSnapError?: Error | undefined",
@@ -4629,7 +4692,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 103,
+                    "line": 105,
                     "character": 20
                   },
                   "name": "Error"
@@ -4640,7 +4703,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 104,
+                  "line": 106,
                   "character": 3
                 },
                 "signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
@@ -4649,7 +4712,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 104,
+                    "line": 106,
                     "character": 29
                   },
                   "name": "boolean"
@@ -4660,7 +4723,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 105,
+                  "line": 107,
                   "character": 3
                 },
                 "signature": "(property) verbose?: boolean | undefined",
@@ -4669,7 +4732,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 105,
+                    "line": 107,
                     "character": 13
                   },
                   "name": "boolean"
@@ -4680,7 +4743,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 106,
+                  "line": 108,
                   "character": 3
                 },
                 "signature": "(property) newFromLane?: string[] | undefined",
@@ -4689,14 +4752,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 106,
+                    "line": 108,
                     "character": 17
                   },
                   "type": {
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 106,
+                      "line": 108,
                       "character": 17
                     },
                     "name": "string"
@@ -4708,7 +4771,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 107,
+                  "line": 109,
                   "character": 3
                 },
                 "signature": "(property) newFromLaneAdded?: boolean | undefined",
@@ -4717,7 +4780,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 107,
+                    "line": 109,
                     "character": 22
                   },
                   "name": "boolean"
@@ -4728,7 +4791,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 108,
+                  "line": 110,
                   "character": 3
                 },
                 "signature": "(property) installationError?: Error | undefined",
@@ -4737,7 +4800,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 108,
+                    "line": 110,
                     "character": 23
                   },
                   "name": "Error"
@@ -4748,7 +4811,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 109,
+                  "line": 111,
                   "character": 3
                 },
                 "signature": "(property) compilationError?: Error | undefined",
@@ -4757,7 +4820,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 109,
+                    "line": 111,
                     "character": 22
                   },
                   "name": "Error"
@@ -4768,7 +4831,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 110,
+                  "line": 112,
                   "character": 3
                 },
                 "signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
@@ -4777,7 +4840,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 110,
+                    "line": 112,
                     "character": 33
                   },
                   "name": "WorkspaceConfigUpdateResult"
@@ -4801,7 +4864,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 91,
+            "line": 93,
             "character": 1
           },
           "signature": "type ApplyVersionResult = {\n    id: ComponentID;\n    filesStatus: FilesStatus;\n}",
@@ -4810,7 +4873,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 91,
+              "line": 93,
               "character": 34
             },
             "members": [
@@ -4818,7 +4881,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 91,
+                  "line": 93,
                   "character": 36
                 },
                 "signature": "(property) id: ComponentID",
@@ -4827,7 +4890,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 91,
+                    "line": 93,
                     "character": 36
                   },
                   "name": "ComponentID",
@@ -4843,7 +4906,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 91,
+                  "line": 93,
                   "character": 53
                 },
                 "signature": "(property) filesStatus: FilesStatus",
@@ -4852,7 +4915,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 91,
+                    "line": 93,
                     "character": 53
                   },
                   "name": "FilesStatus"
@@ -4876,7 +4939,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 82,
+            "line": 84,
             "character": 1
           },
           "signature": "type FilesStatus = {\n    [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
@@ -4885,7 +4948,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 82,
+              "line": 84,
               "character": 27
             },
             "members": [
@@ -4893,14 +4956,14 @@
                 "__schema": "IndexSignatureSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 82,
+                  "line": 84,
                   "character": 29
                 },
                 "keyType": {
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 82,
+                    "line": 84,
                     "character": 30
                   },
                   "name": "fileName",
@@ -4908,7 +4971,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 82,
+                      "line": 84,
                       "character": 40
                     },
                     "name": "string"
@@ -4920,7 +4983,7 @@
                   "__schema": "TypeOperatorSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 82,
+                    "line": 84,
                     "character": 49
                   },
                   "name": "keyof",
@@ -4928,7 +4991,7 @@
                     "__schema": "TypeQuerySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 82,
+                      "line": 84,
                       "character": 55
                     },
                     "signature": "(alias) const FileStatus: {\n    merged: string;\n    manual: string;\n    binaryConflict: string;\n    updated: string;\n    added: string;\n    removed: string;\n    overridden: string;\n    unchanged: string;\n    remainDeleted: string;\n    deletedConflict: string;\n}\nimport FileStatus",
@@ -4936,7 +4999,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 82,
+                        "line": 84,
                         "character": 62
                       },
                       "name": "FileStatus"
@@ -4961,7 +5024,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 79,
+            "line": 81,
             "character": 1
           },
           "signature": "type FailedComponents = {\n    id: ComponentID;\n    unchangedMessage: string;\n    unchangedLegitimately?: boolean | undefined;\n}",
@@ -4970,7 +5033,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 79,
+              "line": 81,
               "character": 32
             },
             "members": [
@@ -4978,7 +5041,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 79,
+                  "line": 81,
                   "character": 34
                 },
                 "signature": "(property) id: ComponentID",
@@ -4987,7 +5050,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 79,
+                    "line": 81,
                     "character": 34
                   },
                   "name": "ComponentID",
@@ -5003,7 +5066,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 79,
+                  "line": 81,
                   "character": 51
                 },
                 "signature": "(property) unchangedMessage: string",
@@ -5012,7 +5075,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 79,
+                    "line": 81,
                     "character": 69
                   },
                   "name": "string"
@@ -5023,7 +5086,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 79,
+                  "line": 81,
                   "character": 77
                 },
                 "signature": "(property) unchangedLegitimately?: boolean | undefined",
@@ -5032,7 +5095,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 79,
+                    "line": 81,
                     "character": 101
                   },
                   "name": "boolean"
@@ -5907,7 +5970,7 @@
                   "_legacy": {
                     "scope": "teambit.component",
                     "name": "merging",
-                    "version": "1.0.483"
+                    "version": "1.0.485"
                   },
                   "_scope": "teambit.component"
                 }
@@ -6727,7 +6790,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -6980,7 +7043,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -7214,7 +7277,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -7291,7 +7354,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.50"
+                              "version": "0.0.52"
                             }
                           },
                           "isOptional": false
@@ -8338,13 +8401,79 @@
             "line": 62,
             "character": 1
           },
+          "signature": "type DivergedComponent = {\n    id: ComponentID;\n    diverge: SnapsDistance;\n}",
+          "name": "DivergedComponent",
+          "type": {
+            "__schema": "TypeLiteralSchema",
+            "location": {
+              "filePath": "merging.main.runtime.ts",
+              "line": 62,
+              "character": 33
+            },
+            "members": [
+              {
+                "__schema": "VariableLikeSchema",
+                "location": {
+                  "filePath": "merging.main.runtime.ts",
+                  "line": 62,
+                  "character": 35
+                },
+                "signature": "(property) id: ComponentID",
+                "name": "id",
+                "type": {
+                  "__schema": "TypeRefSchema",
+                  "location": {
+                    "filePath": "merging.main.runtime.ts",
+                    "line": 62,
+                    "character": 35
+                  },
+                  "name": "ComponentID",
+                  "componentId": {
+                    "scope": "teambit.component",
+                    "name": "component-id",
+                    "version": "1.2.2"
+                  }
+                },
+                "isOptional": false
+              },
+              {
+                "__schema": "VariableLikeSchema",
+                "location": {
+                  "filePath": "merging.main.runtime.ts",
+                  "line": 62,
+                  "character": 52
+                },
+                "signature": "(property) diverge: SnapsDistance",
+                "name": "diverge",
+                "type": {
+                  "__schema": "TypeRefSchema",
+                  "location": {
+                    "filePath": "merging.main.runtime.ts",
+                    "line": 62,
+                    "character": 52
+                  },
+                  "name": "SnapsDistance",
+                  "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
+                },
+                "isOptional": false
+              }
+            ]
+          }
+        },
+        {
+          "__schema": "TypeSchema",
+          "location": {
+            "filePath": "merging.main.runtime.ts",
+            "line": 64,
+            "character": 1
+          },
           "signature": "type ComponentMergeStatus = ComponentStatusBase & {\n    mergeResults?: MergeResultsThreeWay | null | undefined;\n    divergeData?: SnapsDistance | undefined;\n    resolvedUnrelated?: ResolveUnrelatedData | undefined;\n    configMergeResult?: ConfigMergeResult | undefined;\n}",
           "name": "ComponentMergeStatus",
           "type": {
             "__schema": "TypeIntersectionSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 62,
+              "line": 64,
               "character": 36
             },
             "types": [
@@ -8352,7 +8481,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 62,
+                  "line": 64,
                   "character": 36
                 },
                 "name": "ComponentStatusBase"
@@ -8361,7 +8490,7 @@
                 "__schema": "TypeLiteralSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 62,
+                  "line": 64,
                   "character": 58
                 },
                 "members": [
@@ -8369,7 +8498,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 63,
+                      "line": 65,
                       "character": 3
                     },
                     "signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
@@ -8378,7 +8507,7 @@
                       "__schema": "TypeUnionSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 63,
+                        "line": 65,
                         "character": 18
                       },
                       "types": [
@@ -8386,7 +8515,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 63,
+                            "line": 65,
                             "character": 18
                           },
                           "name": "MergeResultsThreeWay"
@@ -8395,7 +8524,7 @@
                           "__schema": "LiteralTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 63,
+                            "line": 65,
                             "character": 41
                           },
                           "name": "null"
@@ -8408,7 +8537,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 64,
+                      "line": 66,
                       "character": 3
                     },
                     "signature": "(property) divergeData?: SnapsDistance | undefined",
@@ -8417,7 +8546,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 64,
+                        "line": 66,
                         "character": 17
                       },
                       "name": "SnapsDistance"
@@ -8428,7 +8557,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 65,
+                      "line": 67,
                       "character": 3
                     },
                     "signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
@@ -8437,7 +8566,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 65,
+                        "line": 67,
                         "character": 23
                       },
                       "name": "ResolveUnrelatedData"
@@ -8448,7 +8577,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 66,
+                      "line": 68,
                       "character": 3
                     },
                     "signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
@@ -8457,7 +8586,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 66,
+                        "line": 68,
                         "character": 23
                       },
                       "name": "ConfigMergeResult"
@@ -8473,7 +8602,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 69,
+            "line": 71,
             "character": 1
           },
           "signature": "type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n    divergeData?: SnapsDistance | undefined;\n    resolvedUnrelated?: ResolveUnrelatedData | undefined;\n    mergeProps?: {\n        ...;\n    } | undefined;\n}",
@@ -8482,7 +8611,7 @@
             "__schema": "TypeIntersectionSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 69,
+              "line": 71,
               "character": 54
             },
             "types": [
@@ -8490,7 +8619,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 69,
+                  "line": 71,
                   "character": 54
                 },
                 "name": "ComponentStatusBase"
@@ -8499,7 +8628,7 @@
                 "__schema": "TypeLiteralSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 69,
+                  "line": 71,
                   "character": 76
                 },
                 "members": [
@@ -8507,7 +8636,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 70,
+                      "line": 72,
                       "character": 3
                     },
                     "signature": "(property) divergeData?: SnapsDistance | undefined",
@@ -8516,7 +8645,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 70,
+                        "line": 72,
                         "character": 17
                       },
                       "name": "SnapsDistance"
@@ -8527,7 +8656,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 71,
+                      "line": 73,
                       "character": 3
                     },
                     "signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
@@ -8536,7 +8665,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 71,
+                        "line": 73,
                         "character": 23
                       },
                       "name": "ResolveUnrelatedData"
@@ -8547,7 +8676,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 72,
+                      "line": 74,
                       "character": 3
                     },
                     "signature": "(property) mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n} | undefined",
@@ -8556,7 +8685,7 @@
                       "__schema": "TypeLiteralSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 72,
+                        "line": 74,
                         "character": 16
                       },
                       "members": [
@@ -8564,7 +8693,7 @@
                           "__schema": "VariableLikeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 73,
+                            "line": 75,
                             "character": 5
                           },
                           "signature": "(property) otherLaneHead: Ref",
@@ -8573,7 +8702,7 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merging.main.runtime.ts",
-                              "line": 73,
+                              "line": 75,
                               "character": 5
                             },
                             "name": "Ref",
@@ -8585,7 +8714,7 @@
                           "__schema": "VariableLikeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 74,
+                            "line": 76,
                             "character": 5
                           },
                           "signature": "(property) currentId: ComponentID",
@@ -8594,7 +8723,7 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merging.main.runtime.ts",
-                              "line": 74,
+                              "line": 76,
                               "character": 5
                             },
                             "name": "ComponentID",
@@ -8610,7 +8739,7 @@
                           "__schema": "VariableLikeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 75,
+                            "line": 77,
                             "character": 5
                           },
                           "signature": "(property) modelComponent: ModelComponent",
@@ -8619,7 +8748,7 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merging.main.runtime.ts",
-                              "line": 75,
+                              "line": 77,
                               "character": 5
                             },
                             "name": "ModelComponent",
@@ -8640,7 +8769,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 79,
+            "line": 81,
             "character": 1
           },
           "signature": "type FailedComponents = {\n    id: ComponentID;\n    unchangedMessage: string;\n    unchangedLegitimately?: boolean | undefined;\n}",
@@ -8649,7 +8778,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 79,
+              "line": 81,
               "character": 32
             },
             "members": [
@@ -8657,7 +8786,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 79,
+                  "line": 81,
                   "character": 34
                 },
                 "signature": "(property) id: ComponentID",
@@ -8666,7 +8795,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 79,
+                    "line": 81,
                     "character": 34
                   },
                   "name": "ComponentID",
@@ -8682,7 +8811,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 79,
+                  "line": 81,
                   "character": 51
                 },
                 "signature": "(property) unchangedMessage: string",
@@ -8691,7 +8820,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 79,
+                    "line": 81,
                     "character": 69
                   },
                   "name": "string"
@@ -8702,7 +8831,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 79,
+                  "line": 81,
                   "character": 77
                 },
                 "signature": "(property) unchangedLegitimately?: boolean | undefined",
@@ -8711,7 +8840,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 79,
+                    "line": 81,
                     "character": 101
                   },
                   "name": "boolean"
@@ -8725,7 +8854,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 82,
+            "line": 84,
             "character": 1
           },
           "signature": "type FilesStatus = {\n    [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
@@ -8734,7 +8863,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 82,
+              "line": 84,
               "character": 27
             },
             "members": [
@@ -8742,14 +8871,14 @@
                 "__schema": "IndexSignatureSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 82,
+                  "line": 84,
                   "character": 29
                 },
                 "keyType": {
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 82,
+                    "line": 84,
                     "character": 30
                   },
                   "name": "fileName",
@@ -8757,7 +8886,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 82,
+                      "line": 84,
                       "character": 40
                     },
                     "name": "string"
@@ -8769,7 +8898,7 @@
                   "__schema": "TypeOperatorSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 82,
+                    "line": 84,
                     "character": 49
                   },
                   "name": "keyof",
@@ -8777,7 +8906,7 @@
                     "__schema": "TypeQuerySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 82,
+                      "line": 84,
                       "character": 55
                     },
                     "signature": "(alias) const FileStatus: {\n    merged: string;\n    manual: string;\n    binaryConflict: string;\n    updated: string;\n    added: string;\n    removed: string;\n    overridden: string;\n    unchanged: string;\n    remainDeleted: string;\n    deletedConflict: string;\n}\nimport FileStatus",
@@ -8785,7 +8914,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 82,
+                        "line": 84,
                         "character": 62
                       },
                       "name": "FileStatus"
@@ -8800,7 +8929,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 84,
+            "line": 86,
             "character": 1
           },
           "signature": "type MergeSnapResults = {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList | undefined;\n    exportedIds?: ComponentID[] | undefined;\n} | null",
@@ -8809,7 +8938,7 @@
             "__schema": "TypeUnionSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 84,
+              "line": 86,
               "character": 32
             },
             "types": [
@@ -8817,7 +8946,7 @@
                 "__schema": "TypeLiteralSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 84,
+                  "line": 86,
                   "character": 32
                 },
                 "members": [
@@ -8825,7 +8954,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 85,
+                      "line": 87,
                       "character": 3
                     },
                     "signature": "(property) snappedComponents: ConsumerComponent[]",
@@ -8834,14 +8963,14 @@
                       "__schema": "TypeArraySchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 85,
+                        "line": 87,
                         "character": 22
                       },
                       "type": {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 85,
+                          "line": 87,
                           "character": 22
                         },
                         "name": "ConsumerComponent"
@@ -8853,7 +8982,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 86,
+                      "line": 88,
                       "character": 3
                     },
                     "signature": "(property) autoSnappedResults: AutoTagResult[]",
@@ -8862,14 +8991,14 @@
                       "__schema": "TypeArraySchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 86,
+                        "line": 88,
                         "character": 23
                       },
                       "type": {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 86,
+                          "line": 88,
                           "character": 23
                         },
                         "name": "AutoTagResult"
@@ -8881,7 +9010,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 87,
+                      "line": 89,
                       "character": 3
                     },
                     "signature": "(property) removedComponents?: ComponentIdList | undefined",
@@ -8890,7 +9019,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 87,
+                        "line": 89,
                         "character": 23
                       },
                       "name": "ComponentIdList"
@@ -8901,7 +9030,7 @@
                     "__schema": "VariableLikeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 88,
+                      "line": 90,
                       "character": 3
                     },
                     "signature": "(property) exportedIds?: ComponentID[] | undefined",
@@ -8910,14 +9039,14 @@
                       "__schema": "TypeArraySchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 88,
+                        "line": 90,
                         "character": 17
                       },
                       "type": {
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 88,
+                          "line": 90,
                           "character": 17
                         },
                         "name": "ComponentID"
@@ -8931,7 +9060,7 @@
                 "__schema": "LiteralTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 89,
+                  "line": 91,
                   "character": 5
                 },
                 "name": "null"
@@ -8943,7 +9072,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 91,
+            "line": 93,
             "character": 1
           },
           "signature": "type ApplyVersionResult = {\n    id: ComponentID;\n    filesStatus: FilesStatus;\n}",
@@ -8952,7 +9081,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 91,
+              "line": 93,
               "character": 34
             },
             "members": [
@@ -8960,7 +9089,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 91,
+                  "line": 93,
                   "character": 36
                 },
                 "signature": "(property) id: ComponentID",
@@ -8969,7 +9098,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 91,
+                    "line": 93,
                     "character": 36
                   },
                   "name": "ComponentID",
@@ -8985,7 +9114,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 91,
+                  "line": 93,
                   "character": 53
                 },
                 "signature": "(property) filesStatus: FilesStatus",
@@ -8994,7 +9123,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 91,
+                    "line": 93,
                     "character": 53
                   },
                   "name": "FilesStatus"
@@ -9008,7 +9137,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 93,
+            "line": 95,
             "character": 1
           },
           "signature": "type ApplyVersionResults = {\n    components?: ApplyVersionResult[] | undefined;\n    version?: string | undefined;\n    failedComponents?: FailedComponents[] | undefined;\n    removedComponents?: ComponentID[] | undefined;\n    ... 12 more ...;\n    workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
@@ -9017,7 +9146,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 93,
+              "line": 95,
               "character": 35
             },
             "members": [
@@ -9025,7 +9154,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 94,
+                  "line": 96,
                   "character": 3
                 },
                 "signature": "(property) components?: ApplyVersionResult[] | undefined",
@@ -9034,14 +9163,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 94,
+                    "line": 96,
                     "character": 16
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 94,
+                      "line": 96,
                       "character": 16
                     },
                     "name": "ApplyVersionResult"
@@ -9053,7 +9182,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 95,
+                  "line": 97,
                   "character": 3
                 },
                 "signature": "(property) version?: string | undefined",
@@ -9062,7 +9191,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 95,
+                    "line": 97,
                     "character": 13
                   },
                   "name": "string"
@@ -9073,7 +9202,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 96,
+                  "line": 98,
                   "character": 3
                 },
                 "signature": "(property) failedComponents?: FailedComponents[] | undefined",
@@ -9082,14 +9211,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 96,
+                    "line": 98,
                     "character": 22
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 96,
+                      "line": 98,
                       "character": 22
                     },
                     "name": "FailedComponents"
@@ -9101,7 +9230,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 97,
+                  "line": 99,
                   "character": 3
                 },
                 "signature": "(property) removedComponents?: ComponentID[] | undefined",
@@ -9110,14 +9239,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 97,
+                    "line": 99,
                     "character": 23
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 97,
+                      "line": 99,
                       "character": 23
                     },
                     "name": "ComponentID"
@@ -9129,7 +9258,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 98,
+                  "line": 100,
                   "character": 3
                 },
                 "signature": "(property) addedComponents?: ComponentID[] | undefined",
@@ -9138,14 +9267,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 98,
+                    "line": 100,
                     "character": 21
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 98,
+                      "line": 100,
                       "character": 21
                     },
                     "name": "ComponentID"
@@ -9157,7 +9286,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 99,
+                  "line": 101,
                   "character": 3
                 },
                 "signature": "(property) newComponents?: ComponentID[] | undefined",
@@ -9166,14 +9295,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 99,
+                    "line": 101,
                     "character": 19
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 99,
+                      "line": 101,
                       "character": 19
                     },
                     "name": "ComponentID"
@@ -9185,7 +9314,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 100,
+                  "line": 102,
                   "character": 3
                 },
                 "signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
@@ -9194,14 +9323,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 100,
+                    "line": 102,
                     "character": 24
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 100,
+                      "line": 102,
                       "character": 24
                     },
                     "name": "ConsumerComponent"
@@ -9213,7 +9342,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 101,
+                  "line": 103,
                   "character": 3
                 },
                 "signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
@@ -9222,14 +9351,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 101,
+                    "line": 103,
                     "character": 23
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 101,
+                      "line": 103,
                       "character": 23
                     },
                     "name": "ApplyVersionResult"
@@ -9241,7 +9370,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 102,
+                  "line": 104,
                   "character": 3
                 },
                 "signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
@@ -9250,7 +9379,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 102,
+                    "line": 104,
                     "character": 22
                   },
                   "name": "MergeSnapResults"
@@ -9261,7 +9390,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 103,
+                  "line": 105,
                   "character": 3
                 },
                 "signature": "(property) mergeSnapError?: Error | undefined",
@@ -9270,7 +9399,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 103,
+                    "line": 105,
                     "character": 20
                   },
                   "name": "Error"
@@ -9281,7 +9410,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 104,
+                  "line": 106,
                   "character": 3
                 },
                 "signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
@@ -9290,7 +9419,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 104,
+                    "line": 106,
                     "character": 29
                   },
                   "name": "boolean"
@@ -9301,7 +9430,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 105,
+                  "line": 107,
                   "character": 3
                 },
                 "signature": "(property) verbose?: boolean | undefined",
@@ -9310,7 +9439,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 105,
+                    "line": 107,
                     "character": 13
                   },
                   "name": "boolean"
@@ -9321,7 +9450,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 106,
+                  "line": 108,
                   "character": 3
                 },
                 "signature": "(property) newFromLane?: string[] | undefined",
@@ -9330,14 +9459,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 106,
+                    "line": 108,
                     "character": 17
                   },
                   "type": {
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 106,
+                      "line": 108,
                       "character": 17
                     },
                     "name": "string"
@@ -9349,7 +9478,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 107,
+                  "line": 109,
                   "character": 3
                 },
                 "signature": "(property) newFromLaneAdded?: boolean | undefined",
@@ -9358,7 +9487,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 107,
+                    "line": 109,
                     "character": 22
                   },
                   "name": "boolean"
@@ -9369,7 +9498,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 108,
+                  "line": 110,
                   "character": 3
                 },
                 "signature": "(property) installationError?: Error | undefined",
@@ -9378,7 +9507,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 108,
+                    "line": 110,
                     "character": 23
                   },
                   "name": "Error"
@@ -9389,7 +9518,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 109,
+                  "line": 111,
                   "character": 3
                 },
                 "signature": "(property) compilationError?: Error | undefined",
@@ -9398,7 +9527,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 109,
+                    "line": 111,
                     "character": 22
                   },
                   "name": "Error"
@@ -9409,7 +9538,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 110,
+                  "line": 112,
                   "character": 3
                 },
                 "signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
@@ -9418,7 +9547,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 110,
+                    "line": 112,
                     "character": 33
                   },
                   "name": "WorkspaceConfigUpdateResult"
@@ -9432,7 +9561,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 113,
+            "line": 115,
             "character": 1
           },
           "signature": "class MergingMain",
@@ -9442,7 +9571,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 114,
+                "line": 116,
                 "character": 3
               },
               "signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain): MergingMain",
@@ -9452,7 +9581,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 115,
+                    "line": 117,
                     "character": 5
                   },
                   "name": "workspace",
@@ -9460,7 +9589,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 115,
+                      "line": 117,
                       "character": 24
                     },
                     "name": "Workspace"
@@ -9472,7 +9601,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 116,
+                    "line": 118,
                     "character": 5
                   },
                   "name": "scope",
@@ -9480,7 +9609,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 116,
+                      "line": 118,
                       "character": 20
                     },
                     "name": "ScopeMain"
@@ -9492,7 +9621,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 117,
+                    "line": 119,
                     "character": 5
                   },
                   "name": "install",
@@ -9500,7 +9629,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 117,
+                      "line": 119,
                       "character": 22
                     },
                     "name": "InstallMain"
@@ -9512,7 +9641,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 118,
+                    "line": 120,
                     "character": 5
                   },
                   "name": "snapping",
@@ -9520,7 +9649,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 118,
+                      "line": 120,
                       "character": 23
                     },
                     "name": "SnappingMain"
@@ -9532,7 +9661,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 119,
+                    "line": 121,
                     "character": 5
                   },
                   "name": "checkout",
@@ -9540,7 +9669,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 119,
+                      "line": 121,
                       "character": 23
                     },
                     "name": "CheckoutMain"
@@ -9552,7 +9681,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 120,
+                    "line": 122,
                     "character": 5
                   },
                   "name": "logger",
@@ -9560,7 +9689,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 120,
+                      "line": 122,
                       "character": 21
                     },
                     "name": "Logger"
@@ -9572,7 +9701,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 121,
+                    "line": 123,
                     "character": 5
                   },
                   "name": "componentWriter",
@@ -9580,7 +9709,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 121,
+                      "line": 123,
                       "character": 30
                     },
                     "name": "ComponentWriterMain"
@@ -9592,7 +9721,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 122,
+                    "line": 124,
                     "character": 5
                   },
                   "name": "importer",
@@ -9600,7 +9729,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 122,
+                      "line": 124,
                       "character": 23
                     },
                     "name": "ImporterMain"
@@ -9612,7 +9741,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 123,
+                    "line": 125,
                     "character": 5
                   },
                   "name": "config",
@@ -9620,7 +9749,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 123,
+                      "line": 125,
                       "character": 21
                     },
                     "name": "ConfigMain"
@@ -9632,7 +9761,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 124,
+                    "line": 126,
                     "character": 5
                   },
                   "name": "remove",
@@ -9640,7 +9769,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 124,
+                      "line": 126,
                       "character": 21
                     },
                     "name": "RemoveMain"
@@ -9652,7 +9781,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 125,
+                    "line": 127,
                     "character": 5
                   },
                   "name": "configMerger",
@@ -9660,7 +9789,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 125,
+                      "line": 127,
                       "character": 27
                     },
                     "name": "ConfigMergerMain"
@@ -9672,7 +9801,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 126,
+                    "line": 128,
                     "character": 5
                   },
                   "name": "depResolver",
@@ -9680,7 +9809,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 126,
+                      "line": 128,
                       "character": 26
                     },
                     "name": "DependencyResolverMain"
@@ -9693,7 +9822,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 113,
+                  "line": 115,
                   "character": 1
                 },
                 "name": "MergingMain"
@@ -9704,7 +9833,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 129,
+                "line": 131,
                 "character": 3
               },
               "signature": "(method) MergingMain.merge(pattern: string, mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noAutoSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
@@ -9714,7 +9843,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 130,
+                    "line": 132,
                     "character": 5
                   },
                   "name": "pattern",
@@ -9722,7 +9851,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 130,
+                      "line": 132,
                       "character": 14
                     },
                     "name": "string"
@@ -9734,7 +9863,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 131,
+                    "line": 133,
                     "character": 5
                   },
                   "name": "mergeStrategy",
@@ -9742,7 +9871,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 131,
+                      "line": 133,
                       "character": 20
                     },
                     "name": "MergeStrategy"
@@ -9754,7 +9883,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 132,
+                    "line": 134,
                     "character": 5
                   },
                   "name": "abort",
@@ -9762,7 +9891,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 132,
+                      "line": 134,
                       "character": 12
                     },
                     "name": "boolean"
@@ -9774,7 +9903,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 133,
+                    "line": 135,
                     "character": 5
                   },
                   "name": "resolve",
@@ -9782,7 +9911,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 133,
+                      "line": 135,
                       "character": 14
                     },
                     "name": "boolean"
@@ -9794,7 +9923,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 134,
+                    "line": 136,
                     "character": 5
                   },
                   "name": "noAutoSnap",
@@ -9802,7 +9931,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 134,
+                      "line": 136,
                       "character": 17
                     },
                     "name": "boolean"
@@ -9814,7 +9943,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 135,
+                    "line": 137,
                     "character": 5
                   },
                   "name": "message",
@@ -9822,7 +9951,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 135,
+                      "line": 137,
                       "character": 14
                     },
                     "name": "string"
@@ -9834,7 +9963,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 136,
+                    "line": 138,
                     "character": 5
                   },
                   "name": "build",
@@ -9842,7 +9971,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 136,
+                      "line": 138,
                       "character": 12
                     },
                     "name": "boolean"
@@ -9854,7 +9983,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 137,
+                    "line": 139,
                     "character": 5
                   },
                   "name": "skipDependencyInstallation",
@@ -9862,7 +9991,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 137,
+                      "line": 139,
                       "character": 33
                     },
                     "name": "boolean"
@@ -9875,7 +10004,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 138,
+                  "line": 140,
                   "character": 6
                 },
                 "name": "Promise",
@@ -9884,7 +10013,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 138,
+                      "line": 140,
                       "character": 14
                     },
                     "name": "ApplyVersionResults"
@@ -9899,14 +10028,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 166,
+                "line": 168,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 162,
+                  "line": 164,
                   "character": 3
                 },
                 "raw": "/**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */",
@@ -9920,7 +10049,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 167,
+                    "line": 169,
                     "character": 5
                   },
                   "name": "consumer",
@@ -9928,7 +10057,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 167,
+                      "line": 169,
                       "character": 15
                     },
                     "name": "Consumer"
@@ -9940,7 +10069,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 168,
+                    "line": 170,
                     "character": 5
                   },
                   "name": "bitIds",
@@ -9948,14 +10077,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 168,
+                      "line": 170,
                       "character": 13
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 168,
+                        "line": 170,
                         "character": 13
                       },
                       "name": "ComponentID"
@@ -9968,7 +10097,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 169,
+                    "line": 171,
                     "character": 5
                   },
                   "name": "mergeStrategy",
@@ -9976,7 +10105,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 169,
+                      "line": 171,
                       "character": 20
                     },
                     "name": "MergeStrategy"
@@ -9988,7 +10117,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 170,
+                    "line": 172,
                     "character": 5
                   },
                   "name": "noAutoSnap",
@@ -9996,7 +10125,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 170,
+                      "line": 172,
                       "character": 17
                     },
                     "name": "boolean"
@@ -10008,7 +10137,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 171,
+                    "line": 173,
                     "character": 5
                   },
                   "name": "snapMessage",
@@ -10016,7 +10145,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 171,
+                      "line": 173,
                       "character": 18
                     },
                     "name": "string"
@@ -10028,7 +10157,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 172,
+                    "line": 174,
                     "character": 5
                   },
                   "name": "build",
@@ -10036,7 +10165,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 172,
+                      "line": 174,
                       "character": 12
                     },
                     "name": "boolean"
@@ -10048,7 +10177,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 173,
+                    "line": 175,
                     "character": 5
                   },
                   "name": "skipDependencyInstallation",
@@ -10056,7 +10185,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 173,
+                      "line": 175,
                       "character": 33
                     },
                     "name": "boolean"
@@ -10069,7 +10198,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 174,
+                  "line": 176,
                   "character": 6
                 },
                 "name": "Promise",
@@ -10078,7 +10207,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 174,
+                      "line": 176,
                       "character": 14
                     },
                     "name": "ApplyVersionResults"
@@ -10093,14 +10222,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 209,
+                "line": 211,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 206,
+                  "line": 208,
                   "character": 3
                 },
                 "raw": "/**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */",
@@ -10114,7 +10243,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 209,
+                    "line": 211,
                     "character": 20
                   },
                   "name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noAutoSnap, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
@@ -10122,7 +10251,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 220,
+                      "line": 222,
                       "character": 6
                     },
                     "members": [
@@ -10130,7 +10259,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 221,
+                          "line": 223,
                           "character": 5
                         },
                         "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -10139,7 +10268,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 221,
+                            "line": 223,
                             "character": 20
                           },
                           "name": "MergeStrategy"
@@ -10150,7 +10279,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 222,
+                          "line": 224,
                           "character": 5
                         },
                         "signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
@@ -10159,14 +10288,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 222,
+                            "line": 224,
                             "character": 26
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merging.main.runtime.ts",
-                              "line": 222,
+                              "line": 224,
                               "character": 26
                             },
                             "name": "ComponentMergeStatus"
@@ -10178,7 +10307,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 223,
+                          "line": 225,
                           "character": 5
                         },
                         "signature": "(property) otherLaneId: LaneId",
@@ -10187,7 +10316,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 223,
+                            "line": 225,
                             "character": 5
                           },
                           "name": "LaneId",
@@ -10203,7 +10332,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 224,
+                          "line": 226,
                           "character": 5
                         },
                         "signature": "(property) currentLane?: Lane | undefined",
@@ -10212,7 +10341,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 224,
+                            "line": 226,
                             "character": 19
                           },
                           "name": "Lane"
@@ -10223,7 +10352,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 225,
+                          "line": 227,
                           "character": 5
                         },
                         "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -10232,7 +10361,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 225,
+                            "line": 227,
                             "character": 18
                           },
                           "name": "boolean"
@@ -10243,7 +10372,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 226,
+                          "line": 228,
                           "character": 5
                         },
                         "signature": "(property) noSnap?: boolean | undefined",
@@ -10252,7 +10381,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 226,
+                            "line": 228,
                             "character": 14
                           },
                           "name": "boolean"
@@ -10263,7 +10392,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 227,
+                          "line": 229,
                           "character": 5
                         },
                         "signature": "(property) tag?: boolean | undefined",
@@ -10272,7 +10401,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 227,
+                            "line": 229,
                             "character": 11
                           },
                           "name": "boolean"
@@ -10283,7 +10412,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 228,
+                          "line": 230,
                           "character": 5
                         },
                         "signature": "(property) snapMessage?: string | undefined",
@@ -10292,7 +10421,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 228,
+                            "line": 230,
                             "character": 19
                           },
                           "name": "string"
@@ -10303,7 +10432,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 229,
+                          "line": 231,
                           "character": 5
                         },
                         "signature": "(property) build?: boolean | undefined",
@@ -10312,7 +10441,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 229,
+                            "line": 231,
                             "character": 13
                           },
                           "name": "boolean"
@@ -10323,7 +10452,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 230,
+                          "line": 232,
                           "character": 5
                         },
                         "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -10332,7 +10461,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 230,
+                            "line": 232,
                             "character": 34
                           },
                           "name": "boolean"
@@ -10347,7 +10476,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 221,
+                        "line": 223,
                         "character": 5
                       },
                       "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -10356,7 +10485,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 221,
+                          "line": 223,
                           "character": 20
                         },
                         "name": "MergeStrategy"
@@ -10367,7 +10496,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 222,
+                        "line": 224,
                         "character": 5
                       },
                       "signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
@@ -10376,14 +10505,14 @@
                         "__schema": "TypeArraySchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 222,
+                          "line": 224,
                           "character": 26
                         },
                         "type": {
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merging.main.runtime.ts",
-                            "line": 222,
+                            "line": 224,
                             "character": 26
                           },
                           "name": "ComponentMergeStatus"
@@ -10395,7 +10524,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 223,
+                        "line": 225,
                         "character": 5
                       },
                       "signature": "(property) otherLaneId: LaneId",
@@ -10404,7 +10533,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 223,
+                          "line": 225,
                           "character": 5
                         },
                         "name": "LaneId",
@@ -10420,7 +10549,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 224,
+                        "line": 226,
                         "character": 5
                       },
                       "signature": "(property) currentLane?: Lane | undefined",
@@ -10429,7 +10558,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 224,
+                          "line": 226,
                           "character": 19
                         },
                         "name": "Lane"
@@ -10440,7 +10569,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 225,
+                        "line": 227,
                         "character": 5
                       },
                       "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -10449,7 +10578,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 225,
+                          "line": 227,
                           "character": 18
                         },
                         "name": "boolean"
@@ -10460,7 +10589,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 226,
+                        "line": 228,
                         "character": 5
                       },
                       "signature": "(property) noSnap?: boolean | undefined",
@@ -10469,7 +10598,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 226,
+                          "line": 228,
                           "character": 14
                         },
                         "name": "boolean"
@@ -10480,7 +10609,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 227,
+                        "line": 229,
                         "character": 5
                       },
                       "signature": "(property) tag?: boolean | undefined",
@@ -10489,7 +10618,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 227,
+                          "line": 229,
                           "character": 11
                         },
                         "name": "boolean"
@@ -10500,7 +10629,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 228,
+                        "line": 230,
                         "character": 5
                       },
                       "signature": "(property) snapMessage?: string | undefined",
@@ -10509,7 +10638,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 228,
+                          "line": 230,
                           "character": 19
                         },
                         "name": "string"
@@ -10520,7 +10649,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 229,
+                        "line": 231,
                         "character": 5
                       },
                       "signature": "(property) build?: boolean | undefined",
@@ -10529,7 +10658,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 229,
+                          "line": 231,
                           "character": 13
                         },
                         "name": "boolean"
@@ -10540,7 +10669,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 230,
+                        "line": 232,
                         "character": 5
                       },
                       "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -10549,7 +10678,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 230,
+                          "line": 232,
                           "character": 34
                         },
                         "name": "boolean"
@@ -10564,7 +10693,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 231,
+                  "line": 233,
                   "character": 7
                 },
                 "name": "Promise",
@@ -10573,7 +10702,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 231,
+                      "line": 233,
                       "character": 15
                     },
                     "name": "ApplyVersionResults"
@@ -10588,7 +10717,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 353,
+                "line": 355,
                 "character": 3
               },
               "signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
@@ -10598,7 +10727,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 354,
+                    "line": 356,
                     "character": 5
                   },
                   "name": "componentsResults",
@@ -10606,14 +10735,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 354,
+                      "line": 356,
                       "character": 24
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 354,
+                        "line": 356,
                         "character": 24
                       },
                       "name": "ApplyVersionWithComps"
@@ -10626,7 +10755,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 355,
+                    "line": 357,
                     "character": 5
                   },
                   "name": "currentLane",
@@ -10634,7 +10763,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 355,
+                      "line": 357,
                       "character": 19
                     },
                     "name": "Lane"
@@ -10646,7 +10775,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 356,
+                    "line": 358,
                     "character": 5
                   },
                   "name": "currentLaneIdsBeforeMerge",
@@ -10654,7 +10783,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 356,
+                      "line": 358,
                       "character": 33
                     },
                     "name": "ComponentIdList"
@@ -10667,7 +10796,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 353,
+                  "line": 355,
                   "character": 3
                 },
                 "type": "Promise<void>"
@@ -10680,14 +10809,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 378,
+                "line": 380,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 372,
+                  "line": 374,
                   "character": 3
                 },
                 "raw": "/**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */",
@@ -10701,7 +10830,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 379,
+                    "line": 381,
                     "character": 5
                   },
                   "name": "bitIds",
@@ -10709,14 +10838,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 379,
+                      "line": 381,
                       "character": 13
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 379,
+                        "line": 381,
                         "character": 13
                       },
                       "name": "ComponentID"
@@ -10729,7 +10858,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 380,
+                    "line": 382,
                     "character": 5
                   },
                   "name": "options",
@@ -10737,7 +10866,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 380,
+                      "line": 382,
                       "character": 14
                     },
                     "name": "MergeStatusProviderOptions"
@@ -10749,7 +10878,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 381,
+                    "line": 383,
                     "character": 5
                   },
                   "name": "currentLane",
@@ -10757,7 +10886,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 381,
+                      "line": 383,
                       "character": 19
                     },
                     "name": "Lane"
@@ -10769,7 +10898,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 382,
+                    "line": 384,
                     "character": 5
                   },
                   "name": "otherLane",
@@ -10777,7 +10906,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 382,
+                      "line": 384,
                       "character": 17
                     },
                     "name": "Lane"
@@ -10790,7 +10919,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 383,
+                  "line": 385,
                   "character": 6
                 },
                 "name": "Promise",
@@ -10799,14 +10928,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 383,
+                      "line": 385,
                       "character": 14
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 383,
+                        "line": 385,
                         "character": 14
                       },
                       "name": "ComponentMergeStatus"
@@ -10818,11 +10947,74 @@
                 "async"
               ]
             },
+            {
+              "__schema": "FunctionLikeSchema",
+              "location": {
+                "filePath": "merging.main.runtime.ts",
+                "line": 677,
+                "character": 3
+              },
+              "signature": "(method) MergingMain.listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]>",
+              "name": "listMergePendingComponents",
+              "params": [
+                {
+                  "__schema": "ParameterSchema",
+                  "location": {
+                    "filePath": "merging.main.runtime.ts",
+                    "line": 677,
+                    "character": 36
+                  },
+                  "name": "componentsList",
+                  "type": {
+                    "__schema": "TypeRefSchema",
+                    "location": {
+                      "filePath": "merging.main.runtime.ts",
+                      "line": 677,
+                      "character": 53
+                    },
+                    "name": "ComponentsList"
+                  },
+                  "isOptional": true,
+                  "isSpread": false
+                }
+              ],
+              "returnType": {
+                "__schema": "TypeRefSchema",
+                "location": {
+                  "filePath": "merging.main.runtime.ts",
+                  "line": 677,
+                  "character": 70
+                },
+                "name": "Promise",
+                "typeArgs": [
+                  {
+                    "__schema": "TypeArraySchema",
+                    "location": {
+                      "filePath": "merging.main.runtime.ts",
+                      "line": 677,
+                      "character": 78
+                    },
+                    "type": {
+                      "__schema": "TypeRefSchema",
+                      "location": {
+                        "filePath": "merging.main.runtime.ts",
+                        "line": 677,
+                        "character": 78
+                      },
+                      "name": "DivergedComponent"
+                    }
+                  }
+                ]
+              },
+              "modifiers": [
+                "async"
+              ]
+            },
             {
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 676,
+                "line": 695,
                 "character": 3
               },
               "signature": "(property) MergingMain.slots: never[]",
@@ -10831,7 +11023,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 676,
+                  "line": 695,
                   "character": 3
                 },
                 "type": "never[]"
@@ -10843,7 +11035,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 677,
+                "line": 696,
                 "character": 3
               },
               "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -10852,7 +11044,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 677,
+                  "line": 696,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -10864,7 +11056,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 693,
+                "line": 712,
                 "character": 3
               },
               "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -10873,7 +11065,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 693,
+                  "line": 712,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -10885,7 +11077,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 694,
+                "line": 713,
                 "character": 3
               },
               "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\n    CLIMain,\n    Workspace,\n    ScopeMain,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain,\n    ConfigMergerMain,\n    DependencyResolverMain\n]): Promise<MergingMain>",
@@ -10895,7 +11087,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 694,
+                    "line": 713,
                     "character": 25
                   },
                   "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
@@ -10903,7 +11095,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 709,
+                      "line": 728,
                       "character": 6
                     },
                     "elements": [
@@ -10911,7 +11103,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 710,
+                          "line": 729,
                           "character": 5
                         },
                         "name": "CLIMain"
@@ -10920,7 +11112,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 711,
+                          "line": 730,
                           "character": 5
                         },
                         "name": "Workspace"
@@ -10929,7 +11121,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 712,
+                          "line": 731,
                           "character": 5
                         },
                         "name": "ScopeMain"
@@ -10938,7 +11130,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 713,
+                          "line": 732,
                           "character": 5
                         },
                         "name": "SnappingMain"
@@ -10947,7 +11139,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 714,
+                          "line": 733,
                           "character": 5
                         },
                         "name": "CheckoutMain"
@@ -10956,7 +11148,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 715,
+                          "line": 734,
                           "character": 5
                         },
                         "name": "InstallMain"
@@ -10965,7 +11157,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 716,
+                          "line": 735,
                           "character": 5
                         },
                         "name": "LoggerMain"
@@ -10974,7 +11166,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 717,
+                          "line": 736,
                           "character": 5
                         },
                         "name": "ComponentWriterMain"
@@ -10983,7 +11175,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 718,
+                          "line": 737,
                           "character": 5
                         },
                         "name": "ImporterMain"
@@ -10992,7 +11184,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 719,
+                          "line": 738,
                           "character": 5
                         },
                         "name": "ConfigMain"
@@ -11001,7 +11193,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 720,
+                          "line": 739,
                           "character": 5
                         },
                         "name": "RemoveMain"
@@ -11010,7 +11202,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 721,
+                          "line": 740,
                           "character": 5
                         },
                         "name": "GlobalConfigMain"
@@ -11019,7 +11211,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 722,
+                          "line": 741,
                           "character": 5
                         },
                         "name": "ConfigMergerMain"
@@ -11028,7 +11220,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 723,
+                          "line": 742,
                           "character": 5
                         },
                         "name": "DependencyResolverMain"
@@ -11043,7 +11235,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 694,
+                  "line": 713,
                   "character": 3
                 },
                 "type": "Promise<MergingMain>"
@@ -11170,7 +11362,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 745,
+            "line": 764,
             "character": 1
           },
           "name": "MergingAspect.addRuntime(MergingMain);",
@@ -11219,7 +11411,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.483"
+    "version": "1.0.485"
   },
   "taggedModuleExports": []
 }