npm - @teambit/merge-lanes - Versions diffs - 1.0.486 → 1.0.488 - Mend

@teambit/merge-lanes 1.0.486 → 1.0.488

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

package/artifacts/__bit_junit.xml +1 -1
package/artifacts/schema.json +348 -348
package/dist/last-merged.d.ts +2 -2
package/dist/last-merged.js +13 -13
package/dist/last-merged.js.map +1 -1
package/dist/merge-lane.cmd.js +5 -5
package/dist/merge-lane.cmd.js.map +1 -1
package/dist/merge-lanes.main.runtime.js.map +1 -1
package/package.json +27 -22
/package/dist/{preview-1733541556857.js → preview-1733830651067.js} +0 -0

package/artifacts/schema.json CHANGED Viewed

@@ -26,7 +26,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 76,
+            "line": 74,
             "character": 1
           },
           "signature": "class MergeLanesMain",
@@ -36,7 +36,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 77,
+                "line": 75,
                 "character": 3
               },
               "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -46,7 +46,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 78,
+                    "line": 76,
                     "character": 5
                   },
                   "name": "workspace",
@@ -54,7 +54,7 @@
                     "__schema": "TypeUnionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 78,
+                      "line": 76,
                       "character": 24
                     },
                     "types": [
@@ -62,7 +62,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 24
                         },
                         "name": "Workspace"
@@ -71,7 +71,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 36
                         },
                         "name": "undefined"
@@ -85,7 +85,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 79,
+                    "line": 77,
                     "character": 5
                   },
                   "name": "merging",
@@ -93,7 +93,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 79,
+                      "line": 77,
                       "character": 22
                     },
                     "name": "MergingMain"
@@ -105,7 +105,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 80,
+                    "line": 78,
                     "character": 5
                   },
                   "name": "lanes",
@@ -113,7 +113,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 80,
+                      "line": 78,
                       "character": 21
                     },
                     "name": "LanesMain"
@@ -125,7 +125,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 81,
+                    "line": 79,
                     "character": 5
                   },
                   "name": "logger",
@@ -133,7 +133,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 81,
+                      "line": 79,
                       "character": 22
                     },
                     "name": "Logger"
@@ -145,7 +145,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 82,
+                    "line": 80,
                     "character": 5
                   },
                   "name": "remove",
@@ -153,7 +153,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 82,
+                      "line": 80,
                       "character": 21
                     },
                     "name": "RemoveMain"
@@ -165,7 +165,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 83,
+                    "line": 81,
                     "character": 5
                   },
                   "name": "scope",
@@ -173,7 +173,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 83,
+                      "line": 81,
                       "character": 20
                     },
                     "name": "ScopeMain"
@@ -185,7 +185,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 84,
+                    "line": 82,
                     "character": 5
                   },
                   "name": "exporter",
@@ -193,7 +193,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 84,
+                      "line": 82,
                       "character": 23
                     },
                     "name": "ExportMain"
@@ -205,7 +205,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 85,
+                    "line": 83,
                     "character": 5
                   },
                   "name": "importer",
@@ -213,7 +213,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 85,
+                      "line": 83,
                       "character": 23
                     },
                     "name": "ImporterMain"
@@ -225,7 +225,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 86,
+                    "line": 84,
                     "character": 5
                   },
                   "name": "checkout",
@@ -233,7 +233,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 86,
+                      "line": 84,
                       "character": 23
                     },
                     "name": "CheckoutMain"
@@ -246,7 +246,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 76,
+                  "line": 74,
                   "character": 1
                 },
                 "name": "MergeLanesMain"
@@ -257,7 +257,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 89,
+                "line": 87,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -267,7 +267,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 24
                   },
                   "name": "laneName",
@@ -275,7 +275,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 34
                     },
                     "name": "string"
@@ -287,7 +287,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 42
                   },
                   "name": "options",
@@ -295,7 +295,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 51
                     },
                     "name": "MergeLaneOptions"
@@ -308,7 +308,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 89,
+                  "line": 87,
                   "character": 3
                 },
                 "type": "Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>"
@@ -321,7 +321,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 99,
+                "line": 97,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -331,7 +331,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 100,
+                    "line": 98,
                     "character": 5
                   },
                   "name": "otherLaneId",
@@ -339,7 +339,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 100,
+                      "line": 98,
                       "character": 18
                     },
                     "name": "LaneId"
@@ -351,7 +351,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 101,
+                    "line": 99,
                     "character": 5
                   },
                   "name": "currentLaneId",
@@ -359,7 +359,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 101,
+                      "line": 99,
                       "character": 20
                     },
                     "name": "LaneId"
@@ -371,7 +371,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 102,
+                    "line": 100,
                     "character": 5
                   },
                   "name": "options",
@@ -379,7 +379,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 102,
+                      "line": 100,
                       "character": 14
                     },
                     "name": "MergeLaneOptions"
@@ -392,7 +392,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 103,
+                  "line": 101,
                   "character": 6
                 },
                 "name": "Promise",
@@ -401,7 +401,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 103,
+                      "line": 101,
                       "character": 14
                     },
                     "members": [
@@ -409,7 +409,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 104,
+                          "line": 102,
                           "character": 5
                         },
                         "signature": "(property) mergeResults: ApplyVersionResults",
@@ -418,7 +418,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 104,
+                            "line": 102,
                             "character": 5
                           },
                           "name": "ApplyVersionResults",
@@ -433,7 +433,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 105,
+                          "line": 103,
                           "character": 5
                         },
                         "signature": "(property) deleteResults: any",
@@ -442,7 +442,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 105,
+                            "line": 103,
                             "character": 20
                           },
                           "name": "any"
@@ -453,7 +453,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 106,
+                          "line": 104,
                           "character": 5
                         },
                         "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -462,14 +462,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 106,
+                            "line": 104,
                             "character": 25
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 106,
+                              "line": 104,
                               "character": 25
                             },
                             "name": "ConfigMergeResult"
@@ -481,7 +481,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 107,
+                          "line": 105,
                           "character": 5
                         },
                         "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -490,14 +490,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 107,
+                            "line": 105,
                             "character": 28
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 107,
+                              "line": 105,
                               "character": 28
                             },
                             "name": "ComponentID"
@@ -509,7 +509,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 108,
+                          "line": 106,
                           "character": 5
                         },
                         "signature": "(property) conflicts: ConflictPerId[]",
@@ -518,14 +518,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 108,
+                            "line": 106,
                             "character": 16
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 108,
+                              "line": 106,
                               "character": 16
                             },
                             "name": "ConflictPerId"
@@ -545,7 +545,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 324,
+                "line": 322,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n    scope?: string;\n}): Promise<CreateLaneResult>",
@@ -555,7 +555,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 19
                   },
                   "name": "newLaneName",
@@ -563,7 +563,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 32
                     },
                     "name": "string"
@@ -575,7 +575,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 40
                   },
                   "name": "options",
@@ -583,7 +583,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 49
                     },
                     "members": [
@@ -591,7 +591,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 324,
+                          "line": 322,
                           "character": 51
                         },
                         "signature": "(property) scope?: string | undefined",
@@ -600,7 +600,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 324,
+                            "line": 322,
                             "character": 59
                           },
                           "name": "string"
@@ -617,7 +617,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 324,
+                  "line": 322,
                   "character": 3
                 },
                 "type": "Promise<CreateLaneResult>"
@@ -630,7 +630,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 332,
+                "line": 330,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>",
@@ -640,7 +640,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 24
                   },
                   "name": "checkoutProps",
@@ -648,7 +648,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 39
                     },
                     "name": "CheckoutProps"
@@ -660,7 +660,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 54
                   },
                   "name": "mergeAbortOpts",
@@ -668,7 +668,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 70
                     },
                     "name": "MergeAbortOpts"
@@ -681,7 +681,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 332,
+                  "line": 330,
                   "character": 3
                 },
                 "type": "Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>"
@@ -694,7 +694,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 388,
+                "line": 386,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n    push?: boolean;\n    reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -704,7 +704,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 389,
+                    "line": 387,
                     "character": 5
                   },
                   "name": "fromLane",
@@ -712,7 +712,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 389,
+                      "line": 387,
                       "character": 15
                     },
                     "name": "string"
@@ -724,7 +724,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 390,
+                    "line": 388,
                     "character": 5
                   },
                   "name": "toLane",
@@ -732,7 +732,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 390,
+                      "line": 388,
                       "character": 13
                     },
                     "name": "string"
@@ -744,7 +744,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 391,
+                    "line": 389,
                     "character": 5
                   },
                   "name": "options",
@@ -752,7 +752,7 @@
                     "__schema": "TypeIntersectionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 391,
+                      "line": 389,
                       "character": 14
                     },
                     "types": [
@@ -760,7 +760,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 14
                         },
                         "name": "Partial",
@@ -769,7 +769,7 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 22
                             },
                             "name": "MergeLaneOptions"
@@ -780,7 +780,7 @@
                         "__schema": "TypeLiteralSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 42
                         },
                         "members": [
@@ -788,7 +788,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 44
                             },
                             "signature": "(property) push?: boolean | undefined",
@@ -797,7 +797,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 51
                               },
                               "name": "boolean"
@@ -808,7 +808,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 60
                             },
                             "signature": "(property) reMerge?: boolean | undefined",
@@ -817,7 +817,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 70
                               },
                               "name": "boolean"
@@ -836,7 +836,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 392,
+                  "line": 390,
                   "character": 6
                 },
                 "name": "Promise",
@@ -845,7 +845,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 392,
+                      "line": 390,
                       "character": 14
                     },
                     "name": "MergeFromScopeResult"
@@ -860,7 +860,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 485,
+                "line": 483,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.slots: never[]",
@@ -869,7 +869,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 485,
+                  "line": 483,
                   "character": 3
                 },
                 "type": "never[]"
@@ -881,7 +881,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 486,
+                "line": 484,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -890,7 +890,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 486,
+                  "line": 484,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -902,7 +902,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 499,
+                "line": 497,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -911,7 +911,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 499,
+                  "line": 497,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -923,7 +923,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 501,
+                "line": 499,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -933,7 +933,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 501,
+                    "line": 499,
                     "character": 25
                   },
                   "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -941,7 +941,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 513,
+                      "line": 511,
                       "character": 6
                     },
                     "elements": [
@@ -949,7 +949,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 514,
+                          "line": 512,
                           "character": 5
                         },
                         "name": "LanesMain"
@@ -958,7 +958,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 515,
+                          "line": 513,
                           "character": 5
                         },
                         "name": "CLIMain"
@@ -967,7 +967,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 516,
+                          "line": 514,
                           "character": 5
                         },
                         "name": "Workspace"
@@ -976,7 +976,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 517,
+                          "line": 515,
                           "character": 5
                         },
                         "name": "MergingMain"
@@ -985,7 +985,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 518,
+                          "line": 516,
                           "character": 5
                         },
                         "name": "LoggerMain"
@@ -994,7 +994,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 519,
+                          "line": 517,
                           "character": 5
                         },
                         "name": "RemoveMain"
@@ -1003,7 +1003,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 520,
+                          "line": 518,
                           "character": 5
                         },
                         "name": "ScopeMain"
@@ -1012,7 +1012,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 521,
+                          "line": 519,
                           "character": 5
                         },
                         "name": "ExportMain"
@@ -1021,7 +1021,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 522,
+                          "line": 520,
                           "character": 5
                         },
                         "name": "ImporterMain"
@@ -1030,7 +1030,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 523,
+                          "line": 521,
                           "character": 5
                         },
                         "name": "CheckoutMain"
@@ -1039,7 +1039,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 524,
+                          "line": 522,
                           "character": 5
                         },
                         "name": "GlobalConfigMain"
@@ -1054,7 +1054,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 501,
+                  "line": 499,
                   "character": 3
                 },
                 "type": "Promise<MergeLanesMain>"
@@ -1131,7 +1131,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 41,
+            "line": 39,
             "character": 1
           },
           "signature": "type MergeLaneOptions = {\n    mergeStrategy: MergeStrategy;\n    ours?: boolean | undefined;\n    theirs?: boolean | undefined;\n    noAutoSnap?: boolean | undefined;\n    noSnap?: boolean | undefined;\n    snapMessage?: string | undefined;\n    existingOnWorkspaceOnly?: boolean | undefined;\n    ... 14 more ...;\n    fetchCurrent?: boolean | undefined;\n}",
@@ -1140,7 +1140,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 41,
+              "line": 39,
               "character": 32
             },
             "members": [
@@ -1148,7 +1148,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 42,
+                  "line": 40,
                   "character": 3
                 },
                 "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -1157,7 +1157,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 42,
+                    "line": 40,
                     "character": 18
                   },
                   "name": "MergeStrategy"
@@ -1168,7 +1168,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 43,
+                  "line": 41,
                   "character": 3
                 },
                 "signature": "(property) ours?: boolean | undefined",
@@ -1177,7 +1177,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 43,
+                    "line": 41,
                     "character": 10
                   },
                   "name": "boolean"
@@ -1188,7 +1188,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 44,
+                  "line": 42,
                   "character": 3
                 },
                 "signature": "(property) theirs?: boolean | undefined",
@@ -1197,7 +1197,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 44,
+                    "line": 42,
                     "character": 12
                   },
                   "name": "boolean"
@@ -1208,7 +1208,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 45,
+                  "line": 43,
                   "character": 3
                 },
                 "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -1217,7 +1217,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 45,
+                    "line": 43,
                     "character": 16
                   },
                   "name": "boolean"
@@ -1228,7 +1228,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 46,
+                  "line": 44,
                   "character": 3
                 },
                 "signature": "(property) noSnap?: boolean | undefined",
@@ -1237,7 +1237,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 46,
+                    "line": 44,
                     "character": 12
                   },
                   "name": "boolean"
@@ -1248,7 +1248,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 47,
+                  "line": 45,
                   "character": 3
                 },
                 "signature": "(property) snapMessage?: string | undefined",
@@ -1257,7 +1257,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 47,
+                    "line": 45,
                     "character": 17
                   },
                   "name": "string"
@@ -1268,7 +1268,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 48,
+                  "line": 46,
                   "character": 3
                 },
                 "signature": "(property) existingOnWorkspaceOnly?: boolean | undefined",
@@ -1277,7 +1277,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 48,
+                    "line": 46,
                     "character": 29
                   },
                   "name": "boolean"
@@ -1288,7 +1288,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 49,
+                  "line": 47,
                   "character": 3
                 },
                 "signature": "(property) build?: boolean | undefined",
@@ -1297,7 +1297,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 49,
+                    "line": 47,
                     "character": 11
                   },
                   "name": "boolean"
@@ -1308,7 +1308,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 50,
+                  "line": 48,
                   "character": 3
                 },
                 "signature": "(property) keepReadme?: boolean | undefined",
@@ -1317,7 +1317,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 50,
+                    "line": 48,
                     "character": 16
                   },
                   "name": "boolean"
@@ -1328,7 +1328,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 51,
+                  "line": 49,
                   "character": 3
                 },
                 "signature": "(property) squash?: boolean | undefined",
@@ -1337,7 +1337,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 51,
+                    "line": 49,
                     "character": 12
                   },
                   "name": "boolean"
@@ -1348,7 +1348,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 52,
+                  "line": 50,
                   "character": 3
                 },
                 "signature": "(property) noSquash?: boolean | undefined",
@@ -1357,7 +1357,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 52,
+                    "line": 50,
                     "character": 14
                   },
                   "name": "boolean"
@@ -1368,7 +1368,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 53,
+                  "line": 51,
                   "character": 3
                 },
                 "signature": "(property) tag?: boolean | undefined",
@@ -1377,7 +1377,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 53,
+                    "line": 51,
                     "character": 9
                   },
                   "name": "boolean"
@@ -1388,7 +1388,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 54,
+                  "line": 52,
                   "character": 3
                 },
                 "signature": "(property) pattern?: string | undefined",
@@ -1397,7 +1397,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 54,
+                    "line": 52,
                     "character": 13
                   },
                   "name": "string"
@@ -1408,7 +1408,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 55,
+                  "line": 53,
                   "character": 3
                 },
                 "signature": "(property) includeDeps?: boolean | undefined",
@@ -1417,7 +1417,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 55,
+                    "line": 53,
                     "character": 17
                   },
                   "name": "boolean"
@@ -1428,7 +1428,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 56,
+                  "line": 54,
                   "character": 3
                 },
                 "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1437,7 +1437,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 56,
+                    "line": 54,
                     "character": 32
                   },
                   "name": "boolean"
@@ -1448,7 +1448,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 57,
+                  "line": 55,
                   "character": 3
                 },
                 "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
@@ -1457,7 +1457,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 57,
+                    "line": 55,
                     "character": 22
                   },
                   "name": "MergeStrategy"
@@ -1468,7 +1468,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 58,
+                  "line": 56,
                   "character": 3
                 },
                 "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1477,7 +1477,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 58,
+                    "line": 56,
                     "character": 25
                   },
                   "name": "boolean"
@@ -1488,7 +1488,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 59,
+                  "line": 57,
                   "character": 3
                 },
                 "signature": "(property) skipFetch?: boolean | undefined",
@@ -1497,7 +1497,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 59,
+                    "line": 57,
                     "character": 15
                   },
                   "name": "boolean"
@@ -1508,7 +1508,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 60,
+                  "line": 58,
                   "character": 3
                 },
                 "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1517,7 +1517,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 60,
+                    "line": 58,
                     "character": 25
                   },
                   "name": "boolean"
@@ -1528,7 +1528,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 61,
+                  "line": 59,
                   "character": 3
                 },
                 "signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
@@ -1537,7 +1537,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 61,
+                    "line": 59,
                     "character": 35
                   },
                   "name": "boolean"
@@ -1548,7 +1548,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 62,
+                  "line": 60,
                   "character": 3
                 },
                 "signature": "(property) throwIfNotUpToDate?: boolean | undefined",
@@ -1557,7 +1557,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 62,
+                    "line": 60,
                     "character": 24
                   },
                   "name": "boolean"
@@ -1568,7 +1568,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 63,
+                  "line": 61,
                   "character": 3
                 },
                 "signature": "(property) fetchCurrent?: boolean | undefined",
@@ -1577,7 +1577,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 63,
+                    "line": 61,
                     "character": 18
                   },
                   "name": "boolean"
@@ -1591,7 +1591,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 65,
+            "line": 63,
             "character": 1
           },
           "signature": "type ConflictPerId = {\n    id: ComponentID;\n    files: string[];\n    config?: boolean | undefined;\n}",
@@ -1600,7 +1600,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 65,
+              "line": 63,
               "character": 29
             },
             "members": [
@@ -1608,7 +1608,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 65,
+                  "line": 63,
                   "character": 31
                 },
                 "signature": "(property) id: ComponentID",
@@ -1617,7 +1617,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 65,
+                    "line": 63,
                     "character": 31
                   },
                   "name": "ComponentID",
@@ -1633,7 +1633,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 65,
+                  "line": 63,
                   "character": 48
                 },
                 "signature": "(property) files: string[]",
@@ -1642,14 +1642,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 65,
+                    "line": 63,
                     "character": 55
                   },
                   "type": {
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 65,
+                      "line": 63,
                       "character": 55
                     },
                     "name": "string"
@@ -1661,7 +1661,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 65,
+                  "line": 63,
                   "character": 65
                 },
                 "signature": "(property) config?: boolean | undefined",
@@ -1670,7 +1670,7 @@
                   "__schema": "KeywordTypeSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 65,
+                    "line": 63,
                     "character": 74
                   },
                   "name": "boolean"
@@ -1684,7 +1684,7 @@
           "__schema": "TypeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 66,
+            "line": 64,
             "character": 1
           },
           "signature": "type MergeFromScopeResult = {\n    mergedNow: ComponentID[];\n    exportedIds: ComponentID[];\n    unmerged: {\n        id: ComponentID;\n        reason: string;\n    }[];\n    conflicts?: ConflictPerId[] | undefined;\n    snappedIds?: ComponentID[] | undefined;\n    mergedPreviously: ComponentID[];\n    mergeSnapError?: Error | undefined;\n}",
@@ -1693,7 +1693,7 @@
             "__schema": "TypeLiteralSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 66,
+              "line": 64,
               "character": 36
             },
             "members": [
@@ -1701,7 +1701,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 67,
+                  "line": 65,
                   "character": 3
                 },
                 "signature": "(property) mergedNow: ComponentID[]",
@@ -1710,14 +1710,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 67,
+                    "line": 65,
                     "character": 14
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 67,
+                      "line": 65,
                       "character": 14
                     },
                     "name": "ComponentID"
@@ -1729,7 +1729,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 68,
+                  "line": 66,
                   "character": 3
                 },
                 "signature": "(property) exportedIds: ComponentID[]",
@@ -1738,14 +1738,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 68,
+                    "line": 66,
                     "character": 16
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 68,
+                      "line": 66,
                       "character": 16
                     },
                     "name": "ComponentID"
@@ -1757,7 +1757,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 69,
+                  "line": 67,
                   "character": 3
                 },
                 "signature": "(property) unmerged: {\n    id: ComponentID;\n    reason: string;\n}[]",
@@ -1766,14 +1766,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 69,
+                    "line": 67,
                     "character": 13
                   },
                   "type": {
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 69,
+                      "line": 67,
                       "character": 13
                     },
                     "members": [
@@ -1781,7 +1781,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 69,
+                          "line": 67,
                           "character": 15
                         },
                         "signature": "(property) id: ComponentID",
@@ -1790,7 +1790,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 69,
+                            "line": 67,
                             "character": 15
                           },
                           "name": "ComponentID",
@@ -1806,7 +1806,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 69,
+                          "line": 67,
                           "character": 32
                         },
                         "signature": "(property) reason: string",
@@ -1815,7 +1815,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 69,
+                            "line": 67,
                             "character": 40
                           },
                           "name": "string"
@@ -1831,7 +1831,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 70,
+                  "line": 68,
                   "character": 3
                 },
                 "signature": "(property) conflicts?: ConflictPerId[] | undefined",
@@ -1840,14 +1840,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 70,
+                    "line": 68,
                     "character": 15
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 70,
+                      "line": 68,
                       "character": 15
                     },
                     "name": "ConflictPerId"
@@ -1859,7 +1859,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 71,
+                  "line": 69,
                   "character": 3
                 },
                 "signature": "(property) snappedIds?: ComponentID[] | undefined",
@@ -1868,14 +1868,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 71,
+                    "line": 69,
                     "character": 16
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 71,
+                      "line": 69,
                       "character": 16
                     },
                     "name": "ComponentID"
@@ -1887,7 +1887,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 72,
+                  "line": 70,
                   "character": 3
                 },
                 "signature": "(property) mergedPreviously: ComponentID[]",
@@ -1896,14 +1896,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 72,
+                    "line": 70,
                     "character": 21
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 72,
+                      "line": 70,
                       "character": 21
                     },
                     "name": "ComponentID"
@@ -1915,7 +1915,7 @@
                 "__schema": "VariableLikeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 73,
+                  "line": 71,
                   "character": 3
                 },
                 "signature": "(property) mergeSnapError?: Error | undefined",
@@ -1924,7 +1924,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 73,
+                    "line": 71,
                     "character": 20
                   },
                   "name": "Error"
@@ -1938,7 +1938,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 76,
+            "line": 74,
             "character": 1
           },
           "signature": "class MergeLanesMain",
@@ -1948,7 +1948,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 77,
+                "line": 75,
                 "character": 3
               },
               "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1958,7 +1958,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 78,
+                    "line": 76,
                     "character": 5
                   },
                   "name": "workspace",
@@ -1966,7 +1966,7 @@
                     "__schema": "TypeUnionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 78,
+                      "line": 76,
                       "character": 24
                     },
                     "types": [
@@ -1974,7 +1974,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 24
                         },
                         "name": "Workspace"
@@ -1983,7 +1983,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 78,
+                          "line": 76,
                           "character": 36
                         },
                         "name": "undefined"
@@ -1997,7 +1997,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 79,
+                    "line": 77,
                     "character": 5
                   },
                   "name": "merging",
@@ -2005,7 +2005,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 79,
+                      "line": 77,
                       "character": 22
                     },
                     "name": "MergingMain"
@@ -2017,7 +2017,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 80,
+                    "line": 78,
                     "character": 5
                   },
                   "name": "lanes",
@@ -2025,7 +2025,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 80,
+                      "line": 78,
                       "character": 21
                     },
                     "name": "LanesMain"
@@ -2037,7 +2037,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 81,
+                    "line": 79,
                     "character": 5
                   },
                   "name": "logger",
@@ -2045,7 +2045,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 81,
+                      "line": 79,
                       "character": 22
                     },
                     "name": "Logger"
@@ -2057,7 +2057,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 82,
+                    "line": 80,
                     "character": 5
                   },
                   "name": "remove",
@@ -2065,7 +2065,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 82,
+                      "line": 80,
                       "character": 21
                     },
                     "name": "RemoveMain"
@@ -2077,7 +2077,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 83,
+                    "line": 81,
                     "character": 5
                   },
                   "name": "scope",
@@ -2085,7 +2085,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 83,
+                      "line": 81,
                       "character": 20
                     },
                     "name": "ScopeMain"
@@ -2097,7 +2097,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 84,
+                    "line": 82,
                     "character": 5
                   },
                   "name": "exporter",
@@ -2105,7 +2105,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 84,
+                      "line": 82,
                       "character": 23
                     },
                     "name": "ExportMain"
@@ -2117,7 +2117,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 85,
+                    "line": 83,
                     "character": 5
                   },
                   "name": "importer",
@@ -2125,7 +2125,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 85,
+                      "line": 83,
                       "character": 23
                     },
                     "name": "ImporterMain"
@@ -2137,7 +2137,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 86,
+                    "line": 84,
                     "character": 5
                   },
                   "name": "checkout",
@@ -2145,7 +2145,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 86,
+                      "line": 84,
                       "character": 23
                     },
                     "name": "CheckoutMain"
@@ -2158,7 +2158,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 76,
+                  "line": 74,
                   "character": 1
                 },
                 "name": "MergeLanesMain"
@@ -2169,7 +2169,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 89,
+                "line": 87,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -2179,7 +2179,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 24
                   },
                   "name": "laneName",
@@ -2187,7 +2187,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 34
                     },
                     "name": "string"
@@ -2199,7 +2199,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 89,
+                    "line": 87,
                     "character": 42
                   },
                   "name": "options",
@@ -2207,7 +2207,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 89,
+                      "line": 87,
                       "character": 51
                     },
                     "name": "MergeLaneOptions"
@@ -2220,7 +2220,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 89,
+                  "line": 87,
                   "character": 3
                 },
                 "type": "Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>"
@@ -2233,7 +2233,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 99,
+                "line": 97,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n}>",
@@ -2243,7 +2243,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 100,
+                    "line": 98,
                     "character": 5
                   },
                   "name": "otherLaneId",
@@ -2251,7 +2251,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 100,
+                      "line": 98,
                       "character": 18
                     },
                     "name": "LaneId"
@@ -2263,7 +2263,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 101,
+                    "line": 99,
                     "character": 5
                   },
                   "name": "currentLaneId",
@@ -2271,7 +2271,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 101,
+                      "line": 99,
                       "character": 20
                     },
                     "name": "LaneId"
@@ -2283,7 +2283,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 102,
+                    "line": 100,
                     "character": 5
                   },
                   "name": "options",
@@ -2291,7 +2291,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 102,
+                      "line": 100,
                       "character": 14
                     },
                     "name": "MergeLaneOptions"
@@ -2304,7 +2304,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 103,
+                  "line": 101,
                   "character": 6
                 },
                 "name": "Promise",
@@ -2313,7 +2313,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 103,
+                      "line": 101,
                       "character": 14
                     },
                     "members": [
@@ -2321,7 +2321,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 104,
+                          "line": 102,
                           "character": 5
                         },
                         "signature": "(property) mergeResults: ApplyVersionResults",
@@ -2330,7 +2330,7 @@
                           "__schema": "TypeRefSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 104,
+                            "line": 102,
                             "character": 5
                           },
                           "name": "ApplyVersionResults",
@@ -2345,7 +2345,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 105,
+                          "line": 103,
                           "character": 5
                         },
                         "signature": "(property) deleteResults: any",
@@ -2354,7 +2354,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 105,
+                            "line": 103,
                             "character": 20
                           },
                           "name": "any"
@@ -2365,7 +2365,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 106,
+                          "line": 104,
                           "character": 5
                         },
                         "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -2374,14 +2374,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 106,
+                            "line": 104,
                             "character": 25
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 106,
+                              "line": 104,
                               "character": 25
                             },
                             "name": "ConfigMergeResult"
@@ -2393,7 +2393,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 107,
+                          "line": 105,
                           "character": 5
                         },
                         "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -2402,14 +2402,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 107,
+                            "line": 105,
                             "character": 28
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 107,
+                              "line": 105,
                               "character": 28
                             },
                             "name": "ComponentID"
@@ -2421,7 +2421,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 108,
+                          "line": 106,
                           "character": 5
                         },
                         "signature": "(property) conflicts: ConflictPerId[]",
@@ -2430,14 +2430,14 @@
                           "__schema": "TypeArraySchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 108,
+                            "line": 106,
                             "character": 16
                           },
                           "type": {
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 108,
+                              "line": 106,
                               "character": 16
                             },
                             "name": "ConflictPerId"
@@ -2457,7 +2457,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 324,
+                "line": 322,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n    scope?: string;\n}): Promise<CreateLaneResult>",
@@ -2467,7 +2467,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 19
                   },
                   "name": "newLaneName",
@@ -2475,7 +2475,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 32
                     },
                     "name": "string"
@@ -2487,7 +2487,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 324,
+                    "line": 322,
                     "character": 40
                   },
                   "name": "options",
@@ -2495,7 +2495,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 324,
+                      "line": 322,
                       "character": 49
                     },
                     "members": [
@@ -2503,7 +2503,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 324,
+                          "line": 322,
                           "character": 51
                         },
                         "signature": "(property) scope?: string | undefined",
@@ -2512,7 +2512,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "merge-lanes.main.runtime.ts",
-                            "line": 324,
+                            "line": 322,
                             "character": 59
                           },
                           "name": "string"
@@ -2529,7 +2529,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 324,
+                  "line": 322,
                   "character": 3
                 },
                 "type": "Promise<CreateLaneResult>"
@@ -2542,7 +2542,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 332,
+                "line": 330,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>",
@@ -2552,7 +2552,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 24
                   },
                   "name": "checkoutProps",
@@ -2560,7 +2560,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 39
                     },
                     "name": "CheckoutProps"
@@ -2572,7 +2572,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 332,
+                    "line": 330,
                     "character": 54
                   },
                   "name": "mergeAbortOpts",
@@ -2580,7 +2580,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 332,
+                      "line": 330,
                       "character": 70
                     },
                     "name": "MergeAbortOpts"
@@ -2593,7 +2593,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 332,
+                  "line": 330,
                   "character": 3
                 },
                 "type": "Promise<{\n    checkoutResults: ApplyVersionResults | undefined;\n    restoredItems: string[];\n    checkoutError: Error | undefined;\n}>"
@@ -2606,7 +2606,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 388,
+                "line": 386,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n    push?: boolean;\n    reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2616,7 +2616,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 389,
+                    "line": 387,
                     "character": 5
                   },
                   "name": "fromLane",
@@ -2624,7 +2624,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 389,
+                      "line": 387,
                       "character": 15
                     },
                     "name": "string"
@@ -2636,7 +2636,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 390,
+                    "line": 388,
                     "character": 5
                   },
                   "name": "toLane",
@@ -2644,7 +2644,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 390,
+                      "line": 388,
                       "character": 13
                     },
                     "name": "string"
@@ -2656,7 +2656,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 391,
+                    "line": 389,
                     "character": 5
                   },
                   "name": "options",
@@ -2664,7 +2664,7 @@
                     "__schema": "TypeIntersectionSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 391,
+                      "line": 389,
                       "character": 14
                     },
                     "types": [
@@ -2672,7 +2672,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 14
                         },
                         "name": "Partial",
@@ -2681,7 +2681,7 @@
                             "__schema": "TypeRefSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 22
                             },
                             "name": "MergeLaneOptions"
@@ -2692,7 +2692,7 @@
                         "__schema": "TypeLiteralSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 391,
+                          "line": 389,
                           "character": 42
                         },
                         "members": [
@@ -2700,7 +2700,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 44
                             },
                             "signature": "(property) push?: boolean | undefined",
@@ -2709,7 +2709,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 51
                               },
                               "name": "boolean"
@@ -2720,7 +2720,7 @@
                             "__schema": "VariableLikeSchema",
                             "location": {
                               "filePath": "merge-lanes.main.runtime.ts",
-                              "line": 391,
+                              "line": 389,
                               "character": 60
                             },
                             "signature": "(property) reMerge?: boolean | undefined",
@@ -2729,7 +2729,7 @@
                               "__schema": "KeywordTypeSchema",
                               "location": {
                                 "filePath": "merge-lanes.main.runtime.ts",
-                                "line": 391,
+                                "line": 389,
                                 "character": 70
                               },
                               "name": "boolean"
@@ -2748,7 +2748,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 392,
+                  "line": 390,
                   "character": 6
                 },
                 "name": "Promise",
@@ -2757,7 +2757,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 392,
+                      "line": 390,
                       "character": 14
                     },
                     "name": "MergeFromScopeResult"
@@ -2772,7 +2772,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 485,
+                "line": 483,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2781,7 +2781,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 485,
+                  "line": 483,
                   "character": 3
                 },
                 "type": "never[]"
@@ -2793,7 +2793,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 486,
+                "line": 484,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2802,7 +2802,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 486,
+                  "line": 484,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -2814,7 +2814,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 499,
+                "line": 497,
                 "character": 3
               },
               "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2823,7 +2823,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 499,
+                  "line": 497,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -2835,7 +2835,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 501,
+                "line": 499,
                 "character": 3
               },
               "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -2845,7 +2845,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 501,
+                    "line": 499,
                     "character": 25
                   },
                   "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2853,7 +2853,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 513,
+                      "line": 511,
                       "character": 6
                     },
                     "elements": [
@@ -2861,7 +2861,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 514,
+                          "line": 512,
                           "character": 5
                         },
                         "name": "LanesMain"
@@ -2870,7 +2870,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 515,
+                          "line": 513,
                           "character": 5
                         },
                         "name": "CLIMain"
@@ -2879,7 +2879,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 516,
+                          "line": 514,
                           "character": 5
                         },
                         "name": "Workspace"
@@ -2888,7 +2888,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 517,
+                          "line": 515,
                           "character": 5
                         },
                         "name": "MergingMain"
@@ -2897,7 +2897,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 518,
+                          "line": 516,
                           "character": 5
                         },
                         "name": "LoggerMain"
@@ -2906,7 +2906,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 519,
+                          "line": 517,
                           "character": 5
                         },
                         "name": "RemoveMain"
@@ -2915,7 +2915,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 520,
+                          "line": 518,
                           "character": 5
                         },
                         "name": "ScopeMain"
@@ -2924,7 +2924,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 521,
+                          "line": 519,
                           "character": 5
                         },
                         "name": "ExportMain"
@@ -2933,7 +2933,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 522,
+                          "line": 520,
                           "character": 5
                         },
                         "name": "ImporterMain"
@@ -2942,7 +2942,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 523,
+                          "line": 521,
                           "character": 5
                         },
                         "name": "CheckoutMain"
@@ -2951,7 +2951,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merge-lanes.main.runtime.ts",
-                          "line": 524,
+                          "line": 522,
                           "character": 5
                         },
                         "name": "GlobalConfigMain"
@@ -2966,7 +2966,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 501,
+                  "line": 499,
                   "character": 3
                 },
                 "type": "Promise<MergeLanesMain>"
@@ -2984,7 +2984,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 796,
+            "line": 794,
             "character": 16
           },
           "name": "MergeLanesMain",
@@ -2996,7 +2996,7 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 547,
+            "line": 545,
             "character": 1
           },
           "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -3006,7 +3006,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 548,
+                "line": 546,
                 "character": 3
               },
               "name": "allComponentsStatus",
@@ -3014,14 +3014,14 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 548,
+                  "line": 546,
                   "character": 24
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 548,
+                    "line": 546,
                     "character": 24
                   },
                   "name": "ComponentMergeStatus"
@@ -3034,7 +3034,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 549,
+                "line": 547,
                 "character": 3
               },
               "name": "compIdsToKeep",
@@ -3042,14 +3042,14 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 549,
+                  "line": 547,
                   "character": 18
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 549,
+                    "line": 547,
                     "character": 18
                   },
                   "name": "ComponentID"
@@ -3062,7 +3062,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 550,
+                "line": 548,
                 "character": 3
               },
               "name": "allBitIds",
@@ -3070,14 +3070,14 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 550,
+                  "line": 548,
                   "character": 14
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 550,
+                    "line": 548,
                     "character": 14
                   },
                   "name": "ComponentID"
@@ -3090,7 +3090,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 551,
+                "line": 549,
                 "character": 3
               },
               "name": "legacyScope",
@@ -3098,7 +3098,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 551,
+                  "line": 549,
                   "character": 16
                 },
                 "name": "LegacyScope"
@@ -3110,7 +3110,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 552,
+                "line": 550,
                 "character": 3
               },
               "name": "includeDeps",
@@ -3118,7 +3118,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 552,
+                  "line": 550,
                   "character": 3
                 },
                 "type": "boolean"
@@ -3131,7 +3131,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 553,
+                "line": 551,
                 "character": 3
               },
               "name": "otherLane",
@@ -3139,7 +3139,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 553,
+                  "line": 551,
                   "character": 15
                 },
                 "name": "Lane"
@@ -3151,7 +3151,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 554,
+                "line": 552,
                 "character": 3
               },
               "name": "shouldSquash",
@@ -3159,7 +3159,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 554,
+                  "line": 552,
                   "character": 18
                 },
                 "name": "boolean"
@@ -3172,7 +3172,7 @@
             "__schema": "TypeRefSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 555,
+              "line": 553,
               "character": 4
             },
             "name": "Promise",
@@ -3181,14 +3181,14 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 555,
+                  "line": 553,
                   "character": 12
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 555,
+                    "line": 553,
                     "character": 12
                   },
                   "name": "ComponentMergeStatus"
@@ -3204,7 +3204,7 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 664,
+            "line": 662,
             "character": 1
           },
           "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n    message: string;\n    date: string;\n    username: string | undefined;\n    email: string | undefined;\n}>",
@@ -3214,7 +3214,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 664,
+                "line": 662,
                 "character": 32
               },
               "name": "otherLaneId",
@@ -3222,7 +3222,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 664,
+                  "line": 662,
                   "character": 45
                 },
                 "name": "LaneId"
@@ -3235,7 +3235,7 @@
             "__schema": "InferenceTypeSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 664,
+              "line": 662,
               "character": 1
             },
             "type": "Promise<{\n    message: string;\n    date: string;\n    username: string | undefined;\n    email: string | undefined;\n}>"
@@ -3248,7 +3248,7 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 673,
+            "line": 671,
             "character": 1
           },
           "signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
@@ -3258,7 +3258,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 674,
+                "line": 672,
                 "character": 3
               },
               "name": "succeededComponents",
@@ -3266,14 +3266,14 @@
                 "__schema": "TypeArraySchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 674,
+                  "line": 672,
                   "character": 24
                 },
                 "type": {
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merge-lanes.main.runtime.ts",
-                    "line": 674,
+                    "line": 672,
                     "character": 24
                   },
                   "name": "ComponentMergeStatus"
@@ -3286,7 +3286,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 675,
+                "line": 673,
                 "character": 3
               },
               "name": "currentLaneId",
@@ -3294,7 +3294,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 675,
+                  "line": 673,
                   "character": 18
                 },
                 "name": "LaneId"
@@ -3306,7 +3306,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 676,
+                "line": 674,
                 "character": 3
               },
               "name": "otherLaneId",
@@ -3314,7 +3314,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 676,
+                  "line": 674,
                   "character": 16
                 },
                 "name": "LaneId"
@@ -3326,7 +3326,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 677,
+                "line": 675,
                 "character": 3
               },
               "name": "scope",
@@ -3334,7 +3334,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 677,
+                  "line": 675,
                   "character": 10
                 },
                 "name": "LegacyScope"
@@ -3346,7 +3346,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 678,
+                "line": 676,
                 "character": 3
               },
               "name": "messageTitle",
@@ -3354,7 +3354,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 678,
+                  "line": 676,
                   "character": 18
                 },
                 "name": "string"
@@ -3367,7 +3367,7 @@
             "__schema": "InferenceTypeSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 673,
+              "line": 671,
               "character": 1
             },
             "type": "Promise<void>"
@@ -3380,14 +3380,14 @@
           "__schema": "FunctionLikeSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 712,
+            "line": 710,
             "character": 1
           },
           "doc": {
             "__schema": "DocSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 709,
+              "line": 707,
               "character": 1
             },
             "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3401,7 +3401,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 713,
+                "line": 711,
                 "character": 3
               },
               "name": "currentLaneName",
@@ -3409,7 +3409,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 713,
+                  "line": 711,
                   "character": 20
                 },
                 "name": "string"
@@ -3421,7 +3421,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 714,
+                "line": 712,
                 "character": 3
               },
               "name": "otherLaneId",
@@ -3429,7 +3429,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 714,
+                  "line": 712,
                   "character": 16
                 },
                 "name": "LaneId"
@@ -3441,7 +3441,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 715,
+                "line": 713,
                 "character": 3
               },
               "name": "id",
@@ -3449,7 +3449,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 715,
+                  "line": 713,
                   "character": 7
                 },
                 "name": "ComponentID"
@@ -3461,7 +3461,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 716,
+                "line": 714,
                 "character": 3
               },
               "name": "divergeData",
@@ -3469,7 +3469,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 716,
+                  "line": 714,
                   "character": 16
                 },
                 "name": "SnapsDistance"
@@ -3481,7 +3481,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 717,
+                "line": 715,
                 "character": 3
               },
               "name": "log",
@@ -3489,7 +3489,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 717,
+                  "line": 715,
                   "character": 8
                 },
                 "name": "Log"
@@ -3501,7 +3501,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 718,
+                "line": 716,
                 "character": 3
               },
               "name": "scope",
@@ -3509,7 +3509,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 718,
+                  "line": 716,
                   "character": 10
                 },
                 "name": "LegacyScope"
@@ -3521,7 +3521,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 719,
+                "line": 717,
                 "character": 3
               },
               "name": "componentFromModel",
@@ -3529,7 +3529,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 719,
+                  "line": 717,
                   "character": 24
                 },
                 "name": "Version"
@@ -3541,7 +3541,7 @@
               "__schema": "ParameterSchema",
               "location": {
                 "filePath": "merge-lanes.main.runtime.ts",
-                "line": 720,
+                "line": 718,
                 "character": 3
               },
               "name": "messageTitle",
@@ -3549,7 +3549,7 @@
                 "__schema": "KeywordTypeSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 720,
+                  "line": 718,
                   "character": 18
                 },
                 "name": "string"
@@ -3562,7 +3562,7 @@
             "__schema": "TypeRefSchema",
             "location": {
               "filePath": "merge-lanes.main.runtime.ts",
-              "line": 721,
+              "line": 719,
               "character": 4
             },
             "name": "Promise",
@@ -3571,7 +3571,7 @@
                 "__schema": "TypeUnionSchema",
                 "location": {
                   "filePath": "merge-lanes.main.runtime.ts",
-                  "line": 721,
+                  "line": 719,
                   "character": 12
                 },
                 "types": [
@@ -3579,7 +3579,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 721,
+                      "line": 719,
                       "character": 12
                     },
                     "name": "Version"
@@ -3588,7 +3588,7 @@
                     "__schema": "KeywordTypeSchema",
                     "location": {
                       "filePath": "merge-lanes.main.runtime.ts",
-                      "line": 721,
+                      "line": 719,
                       "character": 22
                     },
                     "name": "undefined"
@@ -3605,7 +3605,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "merge-lanes.main.runtime.ts",
-            "line": 794,
+            "line": 792,
             "character": 1
           },
           "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3654,7 +3654,7 @@
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.486"
+    "version": "1.0.488"
   },
   "taggedModuleExports": []
 }