@teambit/merge-lanes 1.0.254 → 1.0.255

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.
@@ -17,7 +17,7 @@
17
17
  "__schema": "ClassSchema",
18
18
  "location": {
19
19
  "filePath": "merge-lanes.main.runtime.ts",
20
- "line": 73,
20
+ "line": 74,
21
21
  "character": 1
22
22
  },
23
23
  "signature": "class MergeLanesMain",
@@ -27,7 +27,7 @@
27
27
  "__schema": "ConstructorSchema",
28
28
  "location": {
29
29
  "filePath": "merge-lanes.main.runtime.ts",
30
- "line": 74,
30
+ "line": 75,
31
31
  "character": 3
32
32
  },
33
33
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -37,7 +37,7 @@
37
37
  "__schema": "ParameterSchema",
38
38
  "location": {
39
39
  "filePath": "merge-lanes.main.runtime.ts",
40
- "line": 75,
40
+ "line": 76,
41
41
  "character": 5
42
42
  },
43
43
  "name": "workspace",
@@ -45,7 +45,7 @@
45
45
  "__schema": "TypeUnionSchema",
46
46
  "location": {
47
47
  "filePath": "merge-lanes.main.runtime.ts",
48
- "line": 75,
48
+ "line": 76,
49
49
  "character": 24
50
50
  },
51
51
  "types": [
@@ -53,7 +53,7 @@
53
53
  "__schema": "TypeRefSchema",
54
54
  "location": {
55
55
  "filePath": "merge-lanes.main.runtime.ts",
56
- "line": 75,
56
+ "line": 76,
57
57
  "character": 24
58
58
  },
59
59
  "name": "Workspace",
@@ -66,7 +66,7 @@
66
66
  "__schema": "KeywordTypeSchema",
67
67
  "location": {
68
68
  "filePath": "merge-lanes.main.runtime.ts",
69
- "line": 75,
69
+ "line": 76,
70
70
  "character": 36
71
71
  },
72
72
  "name": "undefined"
@@ -80,7 +80,7 @@
80
80
  "__schema": "ParameterSchema",
81
81
  "location": {
82
82
  "filePath": "merge-lanes.main.runtime.ts",
83
- "line": 76,
83
+ "line": 77,
84
84
  "character": 5
85
85
  },
86
86
  "name": "merging",
@@ -88,7 +88,7 @@
88
88
  "__schema": "TypeRefSchema",
89
89
  "location": {
90
90
  "filePath": "merge-lanes.main.runtime.ts",
91
- "line": 76,
91
+ "line": 77,
92
92
  "character": 22
93
93
  },
94
94
  "name": "MergingMain",
@@ -104,7 +104,7 @@
104
104
  "__schema": "ParameterSchema",
105
105
  "location": {
106
106
  "filePath": "merge-lanes.main.runtime.ts",
107
- "line": 77,
107
+ "line": 78,
108
108
  "character": 5
109
109
  },
110
110
  "name": "lanes",
@@ -112,8 +112,8 @@
112
112
  "__schema": "TypeRefSchema",
113
113
  "location": {
114
114
  "filePath": "merge-lanes.main.runtime.ts",
115
- "line": 77,
116
- "character": 20
115
+ "line": 78,
116
+ "character": 21
117
117
  },
118
118
  "name": "LanesMain",
119
119
  "componentId": {
@@ -128,7 +128,7 @@
128
128
  "__schema": "ParameterSchema",
129
129
  "location": {
130
130
  "filePath": "merge-lanes.main.runtime.ts",
131
- "line": 78,
131
+ "line": 79,
132
132
  "character": 5
133
133
  },
134
134
  "name": "logger",
@@ -136,7 +136,7 @@
136
136
  "__schema": "TypeRefSchema",
137
137
  "location": {
138
138
  "filePath": "merge-lanes.main.runtime.ts",
139
- "line": 78,
139
+ "line": 79,
140
140
  "character": 22
141
141
  },
142
142
  "name": "Logger",
@@ -152,7 +152,7 @@
152
152
  "__schema": "ParameterSchema",
153
153
  "location": {
154
154
  "filePath": "merge-lanes.main.runtime.ts",
155
- "line": 79,
155
+ "line": 80,
156
156
  "character": 5
157
157
  },
158
158
  "name": "remove",
@@ -160,7 +160,7 @@
160
160
  "__schema": "TypeRefSchema",
161
161
  "location": {
162
162
  "filePath": "merge-lanes.main.runtime.ts",
163
- "line": 79,
163
+ "line": 80,
164
164
  "character": 21
165
165
  },
166
166
  "name": "RemoveMain",
@@ -176,7 +176,7 @@
176
176
  "__schema": "ParameterSchema",
177
177
  "location": {
178
178
  "filePath": "merge-lanes.main.runtime.ts",
179
- "line": 80,
179
+ "line": 81,
180
180
  "character": 5
181
181
  },
182
182
  "name": "scope",
@@ -184,7 +184,7 @@
184
184
  "__schema": "TypeRefSchema",
185
185
  "location": {
186
186
  "filePath": "merge-lanes.main.runtime.ts",
187
- "line": 80,
187
+ "line": 81,
188
188
  "character": 20
189
189
  },
190
190
  "name": "ScopeMain",
@@ -200,7 +200,7 @@
200
200
  "__schema": "ParameterSchema",
201
201
  "location": {
202
202
  "filePath": "merge-lanes.main.runtime.ts",
203
- "line": 81,
203
+ "line": 82,
204
204
  "character": 5
205
205
  },
206
206
  "name": "exporter",
@@ -208,7 +208,7 @@
208
208
  "__schema": "TypeRefSchema",
209
209
  "location": {
210
210
  "filePath": "merge-lanes.main.runtime.ts",
211
- "line": 81,
211
+ "line": 82,
212
212
  "character": 23
213
213
  },
214
214
  "name": "ExportMain",
@@ -224,7 +224,7 @@
224
224
  "__schema": "ParameterSchema",
225
225
  "location": {
226
226
  "filePath": "merge-lanes.main.runtime.ts",
227
- "line": 82,
227
+ "line": 83,
228
228
  "character": 5
229
229
  },
230
230
  "name": "importer",
@@ -232,7 +232,7 @@
232
232
  "__schema": "TypeRefSchema",
233
233
  "location": {
234
234
  "filePath": "merge-lanes.main.runtime.ts",
235
- "line": 82,
235
+ "line": 83,
236
236
  "character": 23
237
237
  },
238
238
  "name": "ImporterMain",
@@ -248,7 +248,7 @@
248
248
  "__schema": "ParameterSchema",
249
249
  "location": {
250
250
  "filePath": "merge-lanes.main.runtime.ts",
251
- "line": 83,
251
+ "line": 84,
252
252
  "character": 5
253
253
  },
254
254
  "name": "checkout",
@@ -256,7 +256,7 @@
256
256
  "__schema": "TypeRefSchema",
257
257
  "location": {
258
258
  "filePath": "merge-lanes.main.runtime.ts",
259
- "line": 83,
259
+ "line": 84,
260
260
  "character": 23
261
261
  },
262
262
  "name": "CheckoutMain",
@@ -273,7 +273,7 @@
273
273
  "__schema": "ThisTypeSchema",
274
274
  "location": {
275
275
  "filePath": "merge-lanes.main.runtime.ts",
276
- "line": 73,
276
+ "line": 74,
277
277
  "character": 1
278
278
  },
279
279
  "name": "MergeLanesMain"
@@ -284,7 +284,7 @@
284
284
  "__schema": "FunctionLikeSchema",
285
285
  "location": {
286
286
  "filePath": "merge-lanes.main.runtime.ts",
287
- "line": 86,
287
+ "line": 87,
288
288
  "character": 3
289
289
  },
290
290
  "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}>",
@@ -294,7 +294,7 @@
294
294
  "__schema": "ParameterSchema",
295
295
  "location": {
296
296
  "filePath": "merge-lanes.main.runtime.ts",
297
- "line": 86,
297
+ "line": 87,
298
298
  "character": 24
299
299
  },
300
300
  "name": "laneName",
@@ -302,7 +302,7 @@
302
302
  "__schema": "KeywordTypeSchema",
303
303
  "location": {
304
304
  "filePath": "merge-lanes.main.runtime.ts",
305
- "line": 86,
305
+ "line": 87,
306
306
  "character": 34
307
307
  },
308
308
  "name": "string"
@@ -314,7 +314,7 @@
314
314
  "__schema": "ParameterSchema",
315
315
  "location": {
316
316
  "filePath": "merge-lanes.main.runtime.ts",
317
- "line": 86,
317
+ "line": 87,
318
318
  "character": 42
319
319
  },
320
320
  "name": "options",
@@ -322,7 +322,7 @@
322
322
  "__schema": "TypeRefSchema",
323
323
  "location": {
324
324
  "filePath": "merge-lanes.main.runtime.ts",
325
- "line": 86,
325
+ "line": 87,
326
326
  "character": 51
327
327
  },
328
328
  "name": "MergeLaneOptions",
@@ -336,7 +336,7 @@
336
336
  "__schema": "InferenceTypeSchema",
337
337
  "location": {
338
338
  "filePath": "merge-lanes.main.runtime.ts",
339
- "line": 86,
339
+ "line": 87,
340
340
  "character": 3
341
341
  },
342
342
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
@@ -349,7 +349,7 @@
349
349
  "__schema": "FunctionLikeSchema",
350
350
  "location": {
351
351
  "filePath": "merge-lanes.main.runtime.ts",
352
- "line": 96,
352
+ "line": 97,
353
353
  "character": 3
354
354
  },
355
355
  "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}>",
@@ -359,7 +359,7 @@
359
359
  "__schema": "ParameterSchema",
360
360
  "location": {
361
361
  "filePath": "merge-lanes.main.runtime.ts",
362
- "line": 97,
362
+ "line": 98,
363
363
  "character": 5
364
364
  },
365
365
  "name": "otherLaneId",
@@ -367,7 +367,7 @@
367
367
  "__schema": "TypeRefSchema",
368
368
  "location": {
369
369
  "filePath": "merge-lanes.main.runtime.ts",
370
- "line": 97,
370
+ "line": 98,
371
371
  "character": 18
372
372
  },
373
373
  "name": "LaneId",
@@ -384,7 +384,7 @@
384
384
  "__schema": "ParameterSchema",
385
385
  "location": {
386
386
  "filePath": "merge-lanes.main.runtime.ts",
387
- "line": 98,
387
+ "line": 99,
388
388
  "character": 5
389
389
  },
390
390
  "name": "currentLaneId",
@@ -392,7 +392,7 @@
392
392
  "__schema": "TypeRefSchema",
393
393
  "location": {
394
394
  "filePath": "merge-lanes.main.runtime.ts",
395
- "line": 98,
395
+ "line": 99,
396
396
  "character": 20
397
397
  },
398
398
  "name": "LaneId",
@@ -409,7 +409,7 @@
409
409
  "__schema": "ParameterSchema",
410
410
  "location": {
411
411
  "filePath": "merge-lanes.main.runtime.ts",
412
- "line": 99,
412
+ "line": 100,
413
413
  "character": 5
414
414
  },
415
415
  "name": "options",
@@ -417,7 +417,7 @@
417
417
  "__schema": "TypeRefSchema",
418
418
  "location": {
419
419
  "filePath": "merge-lanes.main.runtime.ts",
420
- "line": 99,
420
+ "line": 100,
421
421
  "character": 14
422
422
  },
423
423
  "name": "MergeLaneOptions",
@@ -431,7 +431,7 @@
431
431
  "__schema": "TypeRefSchema",
432
432
  "location": {
433
433
  "filePath": "merge-lanes.main.runtime.ts",
434
- "line": 100,
434
+ "line": 101,
435
435
  "character": 6
436
436
  },
437
437
  "name": "Promise",
@@ -440,7 +440,7 @@
440
440
  "__schema": "TypeLiteralSchema",
441
441
  "location": {
442
442
  "filePath": "merge-lanes.main.runtime.ts",
443
- "line": 100,
443
+ "line": 101,
444
444
  "character": 14
445
445
  },
446
446
  "members": [
@@ -448,7 +448,7 @@
448
448
  "__schema": "VariableLikeSchema",
449
449
  "location": {
450
450
  "filePath": "merge-lanes.main.runtime.ts",
451
- "line": 101,
451
+ "line": 102,
452
452
  "character": 5
453
453
  },
454
454
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -457,7 +457,7 @@
457
457
  "__schema": "TypeRefSchema",
458
458
  "location": {
459
459
  "filePath": "merge-lanes.main.runtime.ts",
460
- "line": 101,
460
+ "line": 102,
461
461
  "character": 5
462
462
  },
463
463
  "name": "ApplyVersionResults",
@@ -472,7 +472,7 @@
472
472
  "__schema": "VariableLikeSchema",
473
473
  "location": {
474
474
  "filePath": "merge-lanes.main.runtime.ts",
475
- "line": 102,
475
+ "line": 103,
476
476
  "character": 5
477
477
  },
478
478
  "signature": "(property) deleteResults: any",
@@ -481,7 +481,7 @@
481
481
  "__schema": "KeywordTypeSchema",
482
482
  "location": {
483
483
  "filePath": "merge-lanes.main.runtime.ts",
484
- "line": 102,
484
+ "line": 103,
485
485
  "character": 20
486
486
  },
487
487
  "name": "any"
@@ -492,7 +492,7 @@
492
492
  "__schema": "VariableLikeSchema",
493
493
  "location": {
494
494
  "filePath": "merge-lanes.main.runtime.ts",
495
- "line": 103,
495
+ "line": 104,
496
496
  "character": 5
497
497
  },
498
498
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -501,14 +501,14 @@
501
501
  "__schema": "TypeArraySchema",
502
502
  "location": {
503
503
  "filePath": "merge-lanes.main.runtime.ts",
504
- "line": 103,
504
+ "line": 104,
505
505
  "character": 25
506
506
  },
507
507
  "type": {
508
508
  "__schema": "TypeRefSchema",
509
509
  "location": {
510
510
  "filePath": "merge-lanes.main.runtime.ts",
511
- "line": 103,
511
+ "line": 104,
512
512
  "character": 25
513
513
  },
514
514
  "name": "ConfigMergeResult",
@@ -524,7 +524,7 @@
524
524
  "__schema": "VariableLikeSchema",
525
525
  "location": {
526
526
  "filePath": "merge-lanes.main.runtime.ts",
527
- "line": 104,
527
+ "line": 105,
528
528
  "character": 5
529
529
  },
530
530
  "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -533,14 +533,14 @@
533
533
  "__schema": "TypeArraySchema",
534
534
  "location": {
535
535
  "filePath": "merge-lanes.main.runtime.ts",
536
- "line": 104,
536
+ "line": 105,
537
537
  "character": 28
538
538
  },
539
539
  "type": {
540
540
  "__schema": "TypeRefSchema",
541
541
  "location": {
542
542
  "filePath": "merge-lanes.main.runtime.ts",
543
- "line": 104,
543
+ "line": 105,
544
544
  "character": 28
545
545
  },
546
546
  "name": "ComponentID",
@@ -557,7 +557,7 @@
557
557
  "__schema": "VariableLikeSchema",
558
558
  "location": {
559
559
  "filePath": "merge-lanes.main.runtime.ts",
560
- "line": 105,
560
+ "line": 106,
561
561
  "character": 5
562
562
  },
563
563
  "signature": "(property) conflicts: ConflictPerId[]",
@@ -566,14 +566,14 @@
566
566
  "__schema": "TypeArraySchema",
567
567
  "location": {
568
568
  "filePath": "merge-lanes.main.runtime.ts",
569
- "line": 105,
569
+ "line": 106,
570
570
  "character": 16
571
571
  },
572
572
  "type": {
573
573
  "__schema": "TypeRefSchema",
574
574
  "location": {
575
575
  "filePath": "merge-lanes.main.runtime.ts",
576
- "line": 105,
576
+ "line": 106,
577
577
  "character": 16
578
578
  },
579
579
  "name": "ConflictPerId",
@@ -594,7 +594,92 @@
594
594
  "__schema": "FunctionLikeSchema",
595
595
  "location": {
596
596
  "filePath": "merge-lanes.main.runtime.ts",
597
- "line": 318,
597
+ "line": 319,
598
+ "character": 3
599
+ },
600
+ "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
601
+ "name": "mergeMove",
602
+ "params": [
603
+ {
604
+ "__schema": "ParameterSchema",
605
+ "location": {
606
+ "filePath": "merge-lanes.main.runtime.ts",
607
+ "line": 319,
608
+ "character": 19
609
+ },
610
+ "name": "newLaneName",
611
+ "type": {
612
+ "__schema": "KeywordTypeSchema",
613
+ "location": {
614
+ "filePath": "merge-lanes.main.runtime.ts",
615
+ "line": 319,
616
+ "character": 32
617
+ },
618
+ "name": "string"
619
+ },
620
+ "isOptional": false,
621
+ "isSpread": false
622
+ },
623
+ {
624
+ "__schema": "ParameterSchema",
625
+ "location": {
626
+ "filePath": "merge-lanes.main.runtime.ts",
627
+ "line": 319,
628
+ "character": 40
629
+ },
630
+ "name": "options",
631
+ "type": {
632
+ "__schema": "TypeLiteralSchema",
633
+ "location": {
634
+ "filePath": "merge-lanes.main.runtime.ts",
635
+ "line": 319,
636
+ "character": 49
637
+ },
638
+ "members": [
639
+ {
640
+ "__schema": "VariableLikeSchema",
641
+ "location": {
642
+ "filePath": "merge-lanes.main.runtime.ts",
643
+ "line": 319,
644
+ "character": 51
645
+ },
646
+ "signature": "(property) scope?: string | undefined",
647
+ "name": "scope",
648
+ "type": {
649
+ "__schema": "KeywordTypeSchema",
650
+ "location": {
651
+ "filePath": "merge-lanes.main.runtime.ts",
652
+ "line": 319,
653
+ "character": 59
654
+ },
655
+ "name": "string"
656
+ },
657
+ "isOptional": true
658
+ }
659
+ ]
660
+ },
661
+ "isOptional": false,
662
+ "isSpread": false
663
+ }
664
+ ],
665
+ "returnType": {
666
+ "__schema": "InferenceTypeSchema",
667
+ "location": {
668
+ "filePath": "merge-lanes.main.runtime.ts",
669
+ "line": 319,
670
+ "character": 3
671
+ },
672
+ "type": "Promise<CreateLaneResult>"
673
+ },
674
+ "modifiers": [
675
+ "async"
676
+ ]
677
+ },
678
+ {
679
+ "__schema": "FunctionLikeSchema",
680
+ "location": {
681
+ "filePath": "merge-lanes.main.runtime.ts",
682
+ "line": 327,
598
683
  "character": 3
599
684
  },
600
685
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -604,7 +689,7 @@
604
689
  "__schema": "ParameterSchema",
605
690
  "location": {
606
691
  "filePath": "merge-lanes.main.runtime.ts",
607
- "line": 318,
692
+ "line": 327,
608
693
  "character": 24
609
694
  },
610
695
  "name": "checkoutProps",
@@ -612,7 +697,7 @@
612
697
  "__schema": "TypeRefSchema",
613
698
  "location": {
614
699
  "filePath": "merge-lanes.main.runtime.ts",
615
- "line": 318,
700
+ "line": 327,
616
701
  "character": 39
617
702
  },
618
703
  "name": "CheckoutProps",
@@ -628,7 +713,7 @@
628
713
  "__schema": "ParameterSchema",
629
714
  "location": {
630
715
  "filePath": "merge-lanes.main.runtime.ts",
631
- "line": 318,
716
+ "line": 327,
632
717
  "character": 54
633
718
  },
634
719
  "name": "mergeAbortOpts",
@@ -636,7 +721,7 @@
636
721
  "__schema": "TypeRefSchema",
637
722
  "location": {
638
723
  "filePath": "merge-lanes.main.runtime.ts",
639
- "line": 318,
724
+ "line": 327,
640
725
  "character": 70
641
726
  },
642
727
  "name": "MergeAbortOpts",
@@ -650,7 +735,7 @@
650
735
  "__schema": "InferenceTypeSchema",
651
736
  "location": {
652
737
  "filePath": "merge-lanes.main.runtime.ts",
653
- "line": 318,
738
+ "line": 327,
654
739
  "character": 3
655
740
  },
656
741
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -663,7 +748,7 @@
663
748
  "__schema": "FunctionLikeSchema",
664
749
  "location": {
665
750
  "filePath": "merge-lanes.main.runtime.ts",
666
- "line": 374,
751
+ "line": 383,
667
752
  "character": 3
668
753
  },
669
754
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -673,7 +758,7 @@
673
758
  "__schema": "ParameterSchema",
674
759
  "location": {
675
760
  "filePath": "merge-lanes.main.runtime.ts",
676
- "line": 375,
761
+ "line": 384,
677
762
  "character": 5
678
763
  },
679
764
  "name": "fromLane",
@@ -681,7 +766,7 @@
681
766
  "__schema": "KeywordTypeSchema",
682
767
  "location": {
683
768
  "filePath": "merge-lanes.main.runtime.ts",
684
- "line": 375,
769
+ "line": 384,
685
770
  "character": 15
686
771
  },
687
772
  "name": "string"
@@ -693,7 +778,7 @@
693
778
  "__schema": "ParameterSchema",
694
779
  "location": {
695
780
  "filePath": "merge-lanes.main.runtime.ts",
696
- "line": 376,
781
+ "line": 385,
697
782
  "character": 5
698
783
  },
699
784
  "name": "toLane",
@@ -701,7 +786,7 @@
701
786
  "__schema": "KeywordTypeSchema",
702
787
  "location": {
703
788
  "filePath": "merge-lanes.main.runtime.ts",
704
- "line": 376,
789
+ "line": 385,
705
790
  "character": 13
706
791
  },
707
792
  "name": "string"
@@ -713,7 +798,7 @@
713
798
  "__schema": "ParameterSchema",
714
799
  "location": {
715
800
  "filePath": "merge-lanes.main.runtime.ts",
716
- "line": 377,
801
+ "line": 386,
717
802
  "character": 5
718
803
  },
719
804
  "name": "options",
@@ -721,7 +806,7 @@
721
806
  "__schema": "TypeIntersectionSchema",
722
807
  "location": {
723
808
  "filePath": "merge-lanes.main.runtime.ts",
724
- "line": 377,
809
+ "line": 386,
725
810
  "character": 14
726
811
  },
727
812
  "types": [
@@ -729,7 +814,7 @@
729
814
  "__schema": "TypeRefSchema",
730
815
  "location": {
731
816
  "filePath": "merge-lanes.main.runtime.ts",
732
- "line": 377,
817
+ "line": 386,
733
818
  "character": 14
734
819
  },
735
820
  "name": "Partial",
@@ -738,7 +823,7 @@
738
823
  "__schema": "TypeRefSchema",
739
824
  "location": {
740
825
  "filePath": "merge-lanes.main.runtime.ts",
741
- "line": 377,
826
+ "line": 386,
742
827
  "character": 22
743
828
  },
744
829
  "name": "MergeLaneOptions",
@@ -750,7 +835,7 @@
750
835
  "__schema": "TypeLiteralSchema",
751
836
  "location": {
752
837
  "filePath": "merge-lanes.main.runtime.ts",
753
- "line": 377,
838
+ "line": 386,
754
839
  "character": 42
755
840
  },
756
841
  "members": [
@@ -758,7 +843,7 @@
758
843
  "__schema": "VariableLikeSchema",
759
844
  "location": {
760
845
  "filePath": "merge-lanes.main.runtime.ts",
761
- "line": 377,
846
+ "line": 386,
762
847
  "character": 44
763
848
  },
764
849
  "signature": "(property) push?: boolean | undefined",
@@ -767,7 +852,7 @@
767
852
  "__schema": "KeywordTypeSchema",
768
853
  "location": {
769
854
  "filePath": "merge-lanes.main.runtime.ts",
770
- "line": 377,
855
+ "line": 386,
771
856
  "character": 51
772
857
  },
773
858
  "name": "boolean"
@@ -778,7 +863,7 @@
778
863
  "__schema": "VariableLikeSchema",
779
864
  "location": {
780
865
  "filePath": "merge-lanes.main.runtime.ts",
781
- "line": 377,
866
+ "line": 386,
782
867
  "character": 60
783
868
  },
784
869
  "signature": "(property) reMerge?: boolean | undefined",
@@ -787,7 +872,7 @@
787
872
  "__schema": "KeywordTypeSchema",
788
873
  "location": {
789
874
  "filePath": "merge-lanes.main.runtime.ts",
790
- "line": 377,
875
+ "line": 386,
791
876
  "character": 70
792
877
  },
793
878
  "name": "boolean"
@@ -806,7 +891,7 @@
806
891
  "__schema": "TypeRefSchema",
807
892
  "location": {
808
893
  "filePath": "merge-lanes.main.runtime.ts",
809
- "line": 378,
894
+ "line": 387,
810
895
  "character": 6
811
896
  },
812
897
  "name": "Promise",
@@ -815,7 +900,7 @@
815
900
  "__schema": "TypeRefSchema",
816
901
  "location": {
817
902
  "filePath": "merge-lanes.main.runtime.ts",
818
- "line": 378,
903
+ "line": 387,
819
904
  "character": 14
820
905
  },
821
906
  "name": "MergeFromScopeResult",
@@ -831,7 +916,7 @@
831
916
  "__schema": "VariableLikeSchema",
832
917
  "location": {
833
918
  "filePath": "merge-lanes.main.runtime.ts",
834
- "line": 472,
919
+ "line": 481,
835
920
  "character": 3
836
921
  },
837
922
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -840,7 +925,7 @@
840
925
  "__schema": "InferenceTypeSchema",
841
926
  "location": {
842
927
  "filePath": "merge-lanes.main.runtime.ts",
843
- "line": 472,
928
+ "line": 481,
844
929
  "character": 3
845
930
  },
846
931
  "type": "never[]"
@@ -852,7 +937,7 @@
852
937
  "__schema": "VariableLikeSchema",
853
938
  "location": {
854
939
  "filePath": "merge-lanes.main.runtime.ts",
855
- "line": 473,
940
+ "line": 482,
856
941
  "character": 3
857
942
  },
858
943
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -861,7 +946,7 @@
861
946
  "__schema": "InferenceTypeSchema",
862
947
  "location": {
863
948
  "filePath": "merge-lanes.main.runtime.ts",
864
- "line": 473,
949
+ "line": 482,
865
950
  "character": 3
866
951
  },
867
952
  "type": "Aspect[]"
@@ -873,7 +958,7 @@
873
958
  "__schema": "VariableLikeSchema",
874
959
  "location": {
875
960
  "filePath": "merge-lanes.main.runtime.ts",
876
- "line": 486,
961
+ "line": 495,
877
962
  "character": 3
878
963
  },
879
964
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -882,7 +967,7 @@
882
967
  "__schema": "InferenceTypeSchema",
883
968
  "location": {
884
969
  "filePath": "merge-lanes.main.runtime.ts",
885
- "line": 486,
970
+ "line": 495,
886
971
  "character": 3
887
972
  },
888
973
  "type": "RuntimeDefinition"
@@ -894,7 +979,7 @@
894
979
  "__schema": "FunctionLikeSchema",
895
980
  "location": {
896
981
  "filePath": "merge-lanes.main.runtime.ts",
897
- "line": 488,
982
+ "line": 497,
898
983
  "character": 3
899
984
  },
900
985
  "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>",
@@ -904,7 +989,7 @@
904
989
  "__schema": "ParameterSchema",
905
990
  "location": {
906
991
  "filePath": "merge-lanes.main.runtime.ts",
907
- "line": 488,
992
+ "line": 497,
908
993
  "character": 25
909
994
  },
910
995
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -912,7 +997,7 @@
912
997
  "__schema": "TupleTypeSchema",
913
998
  "location": {
914
999
  "filePath": "merge-lanes.main.runtime.ts",
915
- "line": 500,
1000
+ "line": 509,
916
1001
  "character": 6
917
1002
  },
918
1003
  "elements": [
@@ -920,7 +1005,7 @@
920
1005
  "__schema": "TypeRefSchema",
921
1006
  "location": {
922
1007
  "filePath": "merge-lanes.main.runtime.ts",
923
- "line": 501,
1008
+ "line": 510,
924
1009
  "character": 5
925
1010
  },
926
1011
  "name": "LanesMain",
@@ -933,7 +1018,7 @@
933
1018
  "__schema": "TypeRefSchema",
934
1019
  "location": {
935
1020
  "filePath": "merge-lanes.main.runtime.ts",
936
- "line": 502,
1021
+ "line": 511,
937
1022
  "character": 5
938
1023
  },
939
1024
  "name": "CLIMain",
@@ -946,7 +1031,7 @@
946
1031
  "__schema": "TypeRefSchema",
947
1032
  "location": {
948
1033
  "filePath": "merge-lanes.main.runtime.ts",
949
- "line": 503,
1034
+ "line": 512,
950
1035
  "character": 5
951
1036
  },
952
1037
  "name": "Workspace",
@@ -959,7 +1044,7 @@
959
1044
  "__schema": "TypeRefSchema",
960
1045
  "location": {
961
1046
  "filePath": "merge-lanes.main.runtime.ts",
962
- "line": 504,
1047
+ "line": 513,
963
1048
  "character": 5
964
1049
  },
965
1050
  "name": "MergingMain",
@@ -972,7 +1057,7 @@
972
1057
  "__schema": "TypeRefSchema",
973
1058
  "location": {
974
1059
  "filePath": "merge-lanes.main.runtime.ts",
975
- "line": 505,
1060
+ "line": 514,
976
1061
  "character": 5
977
1062
  },
978
1063
  "name": "LoggerMain",
@@ -985,7 +1070,7 @@
985
1070
  "__schema": "TypeRefSchema",
986
1071
  "location": {
987
1072
  "filePath": "merge-lanes.main.runtime.ts",
988
- "line": 506,
1073
+ "line": 515,
989
1074
  "character": 5
990
1075
  },
991
1076
  "name": "RemoveMain",
@@ -998,7 +1083,7 @@
998
1083
  "__schema": "TypeRefSchema",
999
1084
  "location": {
1000
1085
  "filePath": "merge-lanes.main.runtime.ts",
1001
- "line": 507,
1086
+ "line": 516,
1002
1087
  "character": 5
1003
1088
  },
1004
1089
  "name": "ScopeMain",
@@ -1011,7 +1096,7 @@
1011
1096
  "__schema": "TypeRefSchema",
1012
1097
  "location": {
1013
1098
  "filePath": "merge-lanes.main.runtime.ts",
1014
- "line": 508,
1099
+ "line": 517,
1015
1100
  "character": 5
1016
1101
  },
1017
1102
  "name": "ExportMain",
@@ -1024,7 +1109,7 @@
1024
1109
  "__schema": "TypeRefSchema",
1025
1110
  "location": {
1026
1111
  "filePath": "merge-lanes.main.runtime.ts",
1027
- "line": 509,
1112
+ "line": 518,
1028
1113
  "character": 5
1029
1114
  },
1030
1115
  "name": "ImporterMain",
@@ -1037,7 +1122,7 @@
1037
1122
  "__schema": "TypeRefSchema",
1038
1123
  "location": {
1039
1124
  "filePath": "merge-lanes.main.runtime.ts",
1040
- "line": 510,
1125
+ "line": 519,
1041
1126
  "character": 5
1042
1127
  },
1043
1128
  "name": "CheckoutMain",
@@ -1050,7 +1135,7 @@
1050
1135
  "__schema": "TypeRefSchema",
1051
1136
  "location": {
1052
1137
  "filePath": "merge-lanes.main.runtime.ts",
1053
- "line": 511,
1138
+ "line": 520,
1054
1139
  "character": 5
1055
1140
  },
1056
1141
  "name": "GlobalConfigMain",
@@ -1069,7 +1154,7 @@
1069
1154
  "__schema": "InferenceTypeSchema",
1070
1155
  "location": {
1071
1156
  "filePath": "merge-lanes.main.runtime.ts",
1072
- "line": 488,
1157
+ "line": 497,
1073
1158
  "character": 3
1074
1159
  },
1075
1160
  "type": "Promise<MergeLanesMain>"
@@ -1135,7 +1220,7 @@
1135
1220
  "__schema": "TypeSchema",
1136
1221
  "location": {
1137
1222
  "filePath": "merge-lanes.main.runtime.ts",
1138
- "line": 39,
1223
+ "line": 40,
1139
1224
  "character": 1
1140
1225
  },
1141
1226
  "signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean | undefined;\n noSquash: boolean;\n ... 10 more ...;\n fetchCurrent?: boolean | undefined;\n}",
@@ -1144,7 +1229,7 @@
1144
1229
  "__schema": "TypeLiteralSchema",
1145
1230
  "location": {
1146
1231
  "filePath": "merge-lanes.main.runtime.ts",
1147
- "line": 39,
1232
+ "line": 40,
1148
1233
  "character": 32
1149
1234
  },
1150
1235
  "members": [
@@ -1152,7 +1237,7 @@
1152
1237
  "__schema": "VariableLikeSchema",
1153
1238
  "location": {
1154
1239
  "filePath": "merge-lanes.main.runtime.ts",
1155
- "line": 40,
1240
+ "line": 41,
1156
1241
  "character": 3
1157
1242
  },
1158
1243
  "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -1161,7 +1246,7 @@
1161
1246
  "__schema": "TypeRefSchema",
1162
1247
  "location": {
1163
1248
  "filePath": "merge-lanes.main.runtime.ts",
1164
- "line": 40,
1249
+ "line": 41,
1165
1250
  "character": 18
1166
1251
  },
1167
1252
  "name": "MergeStrategy",
@@ -1173,7 +1258,7 @@
1173
1258
  "__schema": "VariableLikeSchema",
1174
1259
  "location": {
1175
1260
  "filePath": "merge-lanes.main.runtime.ts",
1176
- "line": 41,
1261
+ "line": 42,
1177
1262
  "character": 3
1178
1263
  },
1179
1264
  "signature": "(property) ours?: boolean | undefined",
@@ -1182,7 +1267,7 @@
1182
1267
  "__schema": "KeywordTypeSchema",
1183
1268
  "location": {
1184
1269
  "filePath": "merge-lanes.main.runtime.ts",
1185
- "line": 41,
1270
+ "line": 42,
1186
1271
  "character": 10
1187
1272
  },
1188
1273
  "name": "boolean"
@@ -1193,7 +1278,7 @@
1193
1278
  "__schema": "VariableLikeSchema",
1194
1279
  "location": {
1195
1280
  "filePath": "merge-lanes.main.runtime.ts",
1196
- "line": 42,
1281
+ "line": 43,
1197
1282
  "character": 3
1198
1283
  },
1199
1284
  "signature": "(property) theirs?: boolean | undefined",
@@ -1202,7 +1287,7 @@
1202
1287
  "__schema": "KeywordTypeSchema",
1203
1288
  "location": {
1204
1289
  "filePath": "merge-lanes.main.runtime.ts",
1205
- "line": 42,
1290
+ "line": 43,
1206
1291
  "character": 12
1207
1292
  },
1208
1293
  "name": "boolean"
@@ -1213,7 +1298,7 @@
1213
1298
  "__schema": "VariableLikeSchema",
1214
1299
  "location": {
1215
1300
  "filePath": "merge-lanes.main.runtime.ts",
1216
- "line": 43,
1301
+ "line": 44,
1217
1302
  "character": 3
1218
1303
  },
1219
1304
  "signature": "(property) noSnap: boolean",
@@ -1222,7 +1307,7 @@
1222
1307
  "__schema": "KeywordTypeSchema",
1223
1308
  "location": {
1224
1309
  "filePath": "merge-lanes.main.runtime.ts",
1225
- "line": 43,
1310
+ "line": 44,
1226
1311
  "character": 11
1227
1312
  },
1228
1313
  "name": "boolean"
@@ -1233,7 +1318,7 @@
1233
1318
  "__schema": "VariableLikeSchema",
1234
1319
  "location": {
1235
1320
  "filePath": "merge-lanes.main.runtime.ts",
1236
- "line": 44,
1321
+ "line": 45,
1237
1322
  "character": 3
1238
1323
  },
1239
1324
  "signature": "(property) snapMessage: string",
@@ -1242,7 +1327,7 @@
1242
1327
  "__schema": "KeywordTypeSchema",
1243
1328
  "location": {
1244
1329
  "filePath": "merge-lanes.main.runtime.ts",
1245
- "line": 44,
1330
+ "line": 45,
1246
1331
  "character": 16
1247
1332
  },
1248
1333
  "name": "string"
@@ -1253,7 +1338,7 @@
1253
1338
  "__schema": "VariableLikeSchema",
1254
1339
  "location": {
1255
1340
  "filePath": "merge-lanes.main.runtime.ts",
1256
- "line": 45,
1341
+ "line": 46,
1257
1342
  "character": 3
1258
1343
  },
1259
1344
  "signature": "(property) existingOnWorkspaceOnly: boolean",
@@ -1262,7 +1347,7 @@
1262
1347
  "__schema": "KeywordTypeSchema",
1263
1348
  "location": {
1264
1349
  "filePath": "merge-lanes.main.runtime.ts",
1265
- "line": 45,
1350
+ "line": 46,
1266
1351
  "character": 28
1267
1352
  },
1268
1353
  "name": "boolean"
@@ -1273,7 +1358,7 @@
1273
1358
  "__schema": "VariableLikeSchema",
1274
1359
  "location": {
1275
1360
  "filePath": "merge-lanes.main.runtime.ts",
1276
- "line": 46,
1361
+ "line": 47,
1277
1362
  "character": 3
1278
1363
  },
1279
1364
  "signature": "(property) build: boolean",
@@ -1282,7 +1367,7 @@
1282
1367
  "__schema": "KeywordTypeSchema",
1283
1368
  "location": {
1284
1369
  "filePath": "merge-lanes.main.runtime.ts",
1285
- "line": 46,
1370
+ "line": 47,
1286
1371
  "character": 10
1287
1372
  },
1288
1373
  "name": "boolean"
@@ -1293,7 +1378,7 @@
1293
1378
  "__schema": "VariableLikeSchema",
1294
1379
  "location": {
1295
1380
  "filePath": "merge-lanes.main.runtime.ts",
1296
- "line": 47,
1381
+ "line": 48,
1297
1382
  "character": 3
1298
1383
  },
1299
1384
  "signature": "(property) keepReadme: boolean",
@@ -1302,7 +1387,7 @@
1302
1387
  "__schema": "KeywordTypeSchema",
1303
1388
  "location": {
1304
1389
  "filePath": "merge-lanes.main.runtime.ts",
1305
- "line": 47,
1390
+ "line": 48,
1306
1391
  "character": 15
1307
1392
  },
1308
1393
  "name": "boolean"
@@ -1313,7 +1398,7 @@
1313
1398
  "__schema": "VariableLikeSchema",
1314
1399
  "location": {
1315
1400
  "filePath": "merge-lanes.main.runtime.ts",
1316
- "line": 48,
1401
+ "line": 49,
1317
1402
  "character": 3
1318
1403
  },
1319
1404
  "signature": "(property) squash?: boolean | undefined",
@@ -1322,7 +1407,7 @@
1322
1407
  "__schema": "KeywordTypeSchema",
1323
1408
  "location": {
1324
1409
  "filePath": "merge-lanes.main.runtime.ts",
1325
- "line": 48,
1410
+ "line": 49,
1326
1411
  "character": 12
1327
1412
  },
1328
1413
  "name": "boolean"
@@ -1333,7 +1418,7 @@
1333
1418
  "__schema": "VariableLikeSchema",
1334
1419
  "location": {
1335
1420
  "filePath": "merge-lanes.main.runtime.ts",
1336
- "line": 49,
1421
+ "line": 50,
1337
1422
  "character": 3
1338
1423
  },
1339
1424
  "signature": "(property) noSquash: boolean",
@@ -1342,7 +1427,7 @@
1342
1427
  "__schema": "KeywordTypeSchema",
1343
1428
  "location": {
1344
1429
  "filePath": "merge-lanes.main.runtime.ts",
1345
- "line": 49,
1430
+ "line": 50,
1346
1431
  "character": 13
1347
1432
  },
1348
1433
  "name": "boolean"
@@ -1353,7 +1438,7 @@
1353
1438
  "__schema": "VariableLikeSchema",
1354
1439
  "location": {
1355
1440
  "filePath": "merge-lanes.main.runtime.ts",
1356
- "line": 50,
1441
+ "line": 51,
1357
1442
  "character": 3
1358
1443
  },
1359
1444
  "signature": "(property) tag?: boolean | undefined",
@@ -1362,7 +1447,7 @@
1362
1447
  "__schema": "KeywordTypeSchema",
1363
1448
  "location": {
1364
1449
  "filePath": "merge-lanes.main.runtime.ts",
1365
- "line": 50,
1450
+ "line": 51,
1366
1451
  "character": 9
1367
1452
  },
1368
1453
  "name": "boolean"
@@ -1373,7 +1458,7 @@
1373
1458
  "__schema": "VariableLikeSchema",
1374
1459
  "location": {
1375
1460
  "filePath": "merge-lanes.main.runtime.ts",
1376
- "line": 51,
1461
+ "line": 52,
1377
1462
  "character": 3
1378
1463
  },
1379
1464
  "signature": "(property) pattern?: string | undefined",
@@ -1382,7 +1467,7 @@
1382
1467
  "__schema": "KeywordTypeSchema",
1383
1468
  "location": {
1384
1469
  "filePath": "merge-lanes.main.runtime.ts",
1385
- "line": 51,
1470
+ "line": 52,
1386
1471
  "character": 13
1387
1472
  },
1388
1473
  "name": "string"
@@ -1393,7 +1478,7 @@
1393
1478
  "__schema": "VariableLikeSchema",
1394
1479
  "location": {
1395
1480
  "filePath": "merge-lanes.main.runtime.ts",
1396
- "line": 52,
1481
+ "line": 53,
1397
1482
  "character": 3
1398
1483
  },
1399
1484
  "signature": "(property) includeDeps?: boolean | undefined",
@@ -1402,7 +1487,7 @@
1402
1487
  "__schema": "KeywordTypeSchema",
1403
1488
  "location": {
1404
1489
  "filePath": "merge-lanes.main.runtime.ts",
1405
- "line": 52,
1490
+ "line": 53,
1406
1491
  "character": 17
1407
1492
  },
1408
1493
  "name": "boolean"
@@ -1413,7 +1498,7 @@
1413
1498
  "__schema": "VariableLikeSchema",
1414
1499
  "location": {
1415
1500
  "filePath": "merge-lanes.main.runtime.ts",
1416
- "line": 53,
1501
+ "line": 54,
1417
1502
  "character": 3
1418
1503
  },
1419
1504
  "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1422,7 +1507,7 @@
1422
1507
  "__schema": "KeywordTypeSchema",
1423
1508
  "location": {
1424
1509
  "filePath": "merge-lanes.main.runtime.ts",
1425
- "line": 53,
1510
+ "line": 54,
1426
1511
  "character": 32
1427
1512
  },
1428
1513
  "name": "boolean"
@@ -1433,7 +1518,7 @@
1433
1518
  "__schema": "VariableLikeSchema",
1434
1519
  "location": {
1435
1520
  "filePath": "merge-lanes.main.runtime.ts",
1436
- "line": 54,
1521
+ "line": 55,
1437
1522
  "character": 3
1438
1523
  },
1439
1524
  "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
@@ -1442,7 +1527,7 @@
1442
1527
  "__schema": "TypeRefSchema",
1443
1528
  "location": {
1444
1529
  "filePath": "merge-lanes.main.runtime.ts",
1445
- "line": 54,
1530
+ "line": 55,
1446
1531
  "character": 22
1447
1532
  },
1448
1533
  "name": "MergeStrategy",
@@ -1454,7 +1539,7 @@
1454
1539
  "__schema": "VariableLikeSchema",
1455
1540
  "location": {
1456
1541
  "filePath": "merge-lanes.main.runtime.ts",
1457
- "line": 55,
1542
+ "line": 56,
1458
1543
  "character": 3
1459
1544
  },
1460
1545
  "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1463,7 +1548,7 @@
1463
1548
  "__schema": "KeywordTypeSchema",
1464
1549
  "location": {
1465
1550
  "filePath": "merge-lanes.main.runtime.ts",
1466
- "line": 55,
1551
+ "line": 56,
1467
1552
  "character": 25
1468
1553
  },
1469
1554
  "name": "boolean"
@@ -1474,7 +1559,7 @@
1474
1559
  "__schema": "VariableLikeSchema",
1475
1560
  "location": {
1476
1561
  "filePath": "merge-lanes.main.runtime.ts",
1477
- "line": 56,
1562
+ "line": 57,
1478
1563
  "character": 3
1479
1564
  },
1480
1565
  "signature": "(property) skipFetch?: boolean | undefined",
@@ -1483,7 +1568,7 @@
1483
1568
  "__schema": "KeywordTypeSchema",
1484
1569
  "location": {
1485
1570
  "filePath": "merge-lanes.main.runtime.ts",
1486
- "line": 56,
1571
+ "line": 57,
1487
1572
  "character": 15
1488
1573
  },
1489
1574
  "name": "boolean"
@@ -1494,7 +1579,7 @@
1494
1579
  "__schema": "VariableLikeSchema",
1495
1580
  "location": {
1496
1581
  "filePath": "merge-lanes.main.runtime.ts",
1497
- "line": 57,
1582
+ "line": 58,
1498
1583
  "character": 3
1499
1584
  },
1500
1585
  "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1503,7 +1588,7 @@
1503
1588
  "__schema": "KeywordTypeSchema",
1504
1589
  "location": {
1505
1590
  "filePath": "merge-lanes.main.runtime.ts",
1506
- "line": 57,
1591
+ "line": 58,
1507
1592
  "character": 25
1508
1593
  },
1509
1594
  "name": "boolean"
@@ -1514,7 +1599,7 @@
1514
1599
  "__schema": "VariableLikeSchema",
1515
1600
  "location": {
1516
1601
  "filePath": "merge-lanes.main.runtime.ts",
1517
- "line": 58,
1602
+ "line": 59,
1518
1603
  "character": 3
1519
1604
  },
1520
1605
  "signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
@@ -1523,7 +1608,7 @@
1523
1608
  "__schema": "KeywordTypeSchema",
1524
1609
  "location": {
1525
1610
  "filePath": "merge-lanes.main.runtime.ts",
1526
- "line": 58,
1611
+ "line": 59,
1527
1612
  "character": 35
1528
1613
  },
1529
1614
  "name": "boolean"
@@ -1534,7 +1619,7 @@
1534
1619
  "__schema": "VariableLikeSchema",
1535
1620
  "location": {
1536
1621
  "filePath": "merge-lanes.main.runtime.ts",
1537
- "line": 59,
1622
+ "line": 60,
1538
1623
  "character": 3
1539
1624
  },
1540
1625
  "signature": "(property) throwIfNotUpToDate?: boolean | undefined",
@@ -1543,7 +1628,7 @@
1543
1628
  "__schema": "KeywordTypeSchema",
1544
1629
  "location": {
1545
1630
  "filePath": "merge-lanes.main.runtime.ts",
1546
- "line": 59,
1631
+ "line": 60,
1547
1632
  "character": 24
1548
1633
  },
1549
1634
  "name": "boolean"
@@ -1554,7 +1639,7 @@
1554
1639
  "__schema": "VariableLikeSchema",
1555
1640
  "location": {
1556
1641
  "filePath": "merge-lanes.main.runtime.ts",
1557
- "line": 60,
1642
+ "line": 61,
1558
1643
  "character": 3
1559
1644
  },
1560
1645
  "signature": "(property) fetchCurrent?: boolean | undefined",
@@ -1563,7 +1648,7 @@
1563
1648
  "__schema": "KeywordTypeSchema",
1564
1649
  "location": {
1565
1650
  "filePath": "merge-lanes.main.runtime.ts",
1566
- "line": 60,
1651
+ "line": 61,
1567
1652
  "character": 18
1568
1653
  },
1569
1654
  "name": "boolean"
@@ -1577,7 +1662,7 @@
1577
1662
  "__schema": "TypeSchema",
1578
1663
  "location": {
1579
1664
  "filePath": "merge-lanes.main.runtime.ts",
1580
- "line": 62,
1665
+ "line": 63,
1581
1666
  "character": 1
1582
1667
  },
1583
1668
  "signature": "type ConflictPerId = {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}",
@@ -1586,7 +1671,7 @@
1586
1671
  "__schema": "TypeLiteralSchema",
1587
1672
  "location": {
1588
1673
  "filePath": "merge-lanes.main.runtime.ts",
1589
- "line": 62,
1674
+ "line": 63,
1590
1675
  "character": 29
1591
1676
  },
1592
1677
  "members": [
@@ -1594,7 +1679,7 @@
1594
1679
  "__schema": "VariableLikeSchema",
1595
1680
  "location": {
1596
1681
  "filePath": "merge-lanes.main.runtime.ts",
1597
- "line": 62,
1682
+ "line": 63,
1598
1683
  "character": 31
1599
1684
  },
1600
1685
  "signature": "(property) id: ComponentID",
@@ -1603,7 +1688,7 @@
1603
1688
  "__schema": "TypeRefSchema",
1604
1689
  "location": {
1605
1690
  "filePath": "merge-lanes.main.runtime.ts",
1606
- "line": 62,
1691
+ "line": 63,
1607
1692
  "character": 31
1608
1693
  },
1609
1694
  "name": "ComponentID",
@@ -1619,7 +1704,7 @@
1619
1704
  "__schema": "VariableLikeSchema",
1620
1705
  "location": {
1621
1706
  "filePath": "merge-lanes.main.runtime.ts",
1622
- "line": 62,
1707
+ "line": 63,
1623
1708
  "character": 48
1624
1709
  },
1625
1710
  "signature": "(property) files: string[]",
@@ -1628,14 +1713,14 @@
1628
1713
  "__schema": "TypeArraySchema",
1629
1714
  "location": {
1630
1715
  "filePath": "merge-lanes.main.runtime.ts",
1631
- "line": 62,
1716
+ "line": 63,
1632
1717
  "character": 55
1633
1718
  },
1634
1719
  "type": {
1635
1720
  "__schema": "KeywordTypeSchema",
1636
1721
  "location": {
1637
1722
  "filePath": "merge-lanes.main.runtime.ts",
1638
- "line": 62,
1723
+ "line": 63,
1639
1724
  "character": 55
1640
1725
  },
1641
1726
  "name": "string"
@@ -1647,7 +1732,7 @@
1647
1732
  "__schema": "VariableLikeSchema",
1648
1733
  "location": {
1649
1734
  "filePath": "merge-lanes.main.runtime.ts",
1650
- "line": 62,
1735
+ "line": 63,
1651
1736
  "character": 65
1652
1737
  },
1653
1738
  "signature": "(property) config?: boolean | undefined",
@@ -1656,7 +1741,7 @@
1656
1741
  "__schema": "KeywordTypeSchema",
1657
1742
  "location": {
1658
1743
  "filePath": "merge-lanes.main.runtime.ts",
1659
- "line": 62,
1744
+ "line": 63,
1660
1745
  "character": 74
1661
1746
  },
1662
1747
  "name": "boolean"
@@ -1670,7 +1755,7 @@
1670
1755
  "__schema": "TypeSchema",
1671
1756
  "location": {
1672
1757
  "filePath": "merge-lanes.main.runtime.ts",
1673
- "line": 63,
1758
+ "line": 64,
1674
1759
  "character": 1
1675
1760
  },
1676
1761
  "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}",
@@ -1679,7 +1764,7 @@
1679
1764
  "__schema": "TypeLiteralSchema",
1680
1765
  "location": {
1681
1766
  "filePath": "merge-lanes.main.runtime.ts",
1682
- "line": 63,
1767
+ "line": 64,
1683
1768
  "character": 36
1684
1769
  },
1685
1770
  "members": [
@@ -1687,7 +1772,7 @@
1687
1772
  "__schema": "VariableLikeSchema",
1688
1773
  "location": {
1689
1774
  "filePath": "merge-lanes.main.runtime.ts",
1690
- "line": 64,
1775
+ "line": 65,
1691
1776
  "character": 3
1692
1777
  },
1693
1778
  "signature": "(property) mergedNow: ComponentID[]",
@@ -1696,14 +1781,14 @@
1696
1781
  "__schema": "TypeArraySchema",
1697
1782
  "location": {
1698
1783
  "filePath": "merge-lanes.main.runtime.ts",
1699
- "line": 64,
1784
+ "line": 65,
1700
1785
  "character": 14
1701
1786
  },
1702
1787
  "type": {
1703
1788
  "__schema": "TypeRefSchema",
1704
1789
  "location": {
1705
1790
  "filePath": "merge-lanes.main.runtime.ts",
1706
- "line": 64,
1791
+ "line": 65,
1707
1792
  "character": 14
1708
1793
  },
1709
1794
  "name": "ComponentID",
@@ -1720,7 +1805,7 @@
1720
1805
  "__schema": "VariableLikeSchema",
1721
1806
  "location": {
1722
1807
  "filePath": "merge-lanes.main.runtime.ts",
1723
- "line": 65,
1808
+ "line": 66,
1724
1809
  "character": 3
1725
1810
  },
1726
1811
  "signature": "(property) exportedIds: ComponentID[]",
@@ -1729,14 +1814,14 @@
1729
1814
  "__schema": "TypeArraySchema",
1730
1815
  "location": {
1731
1816
  "filePath": "merge-lanes.main.runtime.ts",
1732
- "line": 65,
1817
+ "line": 66,
1733
1818
  "character": 16
1734
1819
  },
1735
1820
  "type": {
1736
1821
  "__schema": "TypeRefSchema",
1737
1822
  "location": {
1738
1823
  "filePath": "merge-lanes.main.runtime.ts",
1739
- "line": 65,
1824
+ "line": 66,
1740
1825
  "character": 16
1741
1826
  },
1742
1827
  "name": "ComponentID",
@@ -1753,7 +1838,7 @@
1753
1838
  "__schema": "VariableLikeSchema",
1754
1839
  "location": {
1755
1840
  "filePath": "merge-lanes.main.runtime.ts",
1756
- "line": 66,
1841
+ "line": 67,
1757
1842
  "character": 3
1758
1843
  },
1759
1844
  "signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
@@ -1762,14 +1847,14 @@
1762
1847
  "__schema": "TypeArraySchema",
1763
1848
  "location": {
1764
1849
  "filePath": "merge-lanes.main.runtime.ts",
1765
- "line": 66,
1850
+ "line": 67,
1766
1851
  "character": 13
1767
1852
  },
1768
1853
  "type": {
1769
1854
  "__schema": "TypeLiteralSchema",
1770
1855
  "location": {
1771
1856
  "filePath": "merge-lanes.main.runtime.ts",
1772
- "line": 66,
1857
+ "line": 67,
1773
1858
  "character": 13
1774
1859
  },
1775
1860
  "members": [
@@ -1777,7 +1862,7 @@
1777
1862
  "__schema": "VariableLikeSchema",
1778
1863
  "location": {
1779
1864
  "filePath": "merge-lanes.main.runtime.ts",
1780
- "line": 66,
1865
+ "line": 67,
1781
1866
  "character": 15
1782
1867
  },
1783
1868
  "signature": "(property) id: ComponentID",
@@ -1786,7 +1871,7 @@
1786
1871
  "__schema": "TypeRefSchema",
1787
1872
  "location": {
1788
1873
  "filePath": "merge-lanes.main.runtime.ts",
1789
- "line": 66,
1874
+ "line": 67,
1790
1875
  "character": 15
1791
1876
  },
1792
1877
  "name": "ComponentID",
@@ -1802,7 +1887,7 @@
1802
1887
  "__schema": "VariableLikeSchema",
1803
1888
  "location": {
1804
1889
  "filePath": "merge-lanes.main.runtime.ts",
1805
- "line": 66,
1890
+ "line": 67,
1806
1891
  "character": 32
1807
1892
  },
1808
1893
  "signature": "(property) reason: string",
@@ -1811,7 +1896,7 @@
1811
1896
  "__schema": "KeywordTypeSchema",
1812
1897
  "location": {
1813
1898
  "filePath": "merge-lanes.main.runtime.ts",
1814
- "line": 66,
1899
+ "line": 67,
1815
1900
  "character": 40
1816
1901
  },
1817
1902
  "name": "string"
@@ -1827,7 +1912,7 @@
1827
1912
  "__schema": "VariableLikeSchema",
1828
1913
  "location": {
1829
1914
  "filePath": "merge-lanes.main.runtime.ts",
1830
- "line": 67,
1915
+ "line": 68,
1831
1916
  "character": 3
1832
1917
  },
1833
1918
  "signature": "(property) conflicts?: ConflictPerId[] | undefined",
@@ -1836,14 +1921,14 @@
1836
1921
  "__schema": "TypeArraySchema",
1837
1922
  "location": {
1838
1923
  "filePath": "merge-lanes.main.runtime.ts",
1839
- "line": 67,
1924
+ "line": 68,
1840
1925
  "character": 15
1841
1926
  },
1842
1927
  "type": {
1843
1928
  "__schema": "TypeRefSchema",
1844
1929
  "location": {
1845
1930
  "filePath": "merge-lanes.main.runtime.ts",
1846
- "line": 67,
1931
+ "line": 68,
1847
1932
  "character": 15
1848
1933
  },
1849
1934
  "name": "ConflictPerId",
@@ -1856,7 +1941,7 @@
1856
1941
  "__schema": "VariableLikeSchema",
1857
1942
  "location": {
1858
1943
  "filePath": "merge-lanes.main.runtime.ts",
1859
- "line": 68,
1944
+ "line": 69,
1860
1945
  "character": 3
1861
1946
  },
1862
1947
  "signature": "(property) snappedIds?: ComponentID[] | undefined",
@@ -1865,14 +1950,14 @@
1865
1950
  "__schema": "TypeArraySchema",
1866
1951
  "location": {
1867
1952
  "filePath": "merge-lanes.main.runtime.ts",
1868
- "line": 68,
1953
+ "line": 69,
1869
1954
  "character": 16
1870
1955
  },
1871
1956
  "type": {
1872
1957
  "__schema": "TypeRefSchema",
1873
1958
  "location": {
1874
1959
  "filePath": "merge-lanes.main.runtime.ts",
1875
- "line": 68,
1960
+ "line": 69,
1876
1961
  "character": 16
1877
1962
  },
1878
1963
  "name": "ComponentID",
@@ -1889,7 +1974,7 @@
1889
1974
  "__schema": "VariableLikeSchema",
1890
1975
  "location": {
1891
1976
  "filePath": "merge-lanes.main.runtime.ts",
1892
- "line": 69,
1977
+ "line": 70,
1893
1978
  "character": 3
1894
1979
  },
1895
1980
  "signature": "(property) mergedPreviously: ComponentID[]",
@@ -1898,14 +1983,14 @@
1898
1983
  "__schema": "TypeArraySchema",
1899
1984
  "location": {
1900
1985
  "filePath": "merge-lanes.main.runtime.ts",
1901
- "line": 69,
1986
+ "line": 70,
1902
1987
  "character": 21
1903
1988
  },
1904
1989
  "type": {
1905
1990
  "__schema": "TypeRefSchema",
1906
1991
  "location": {
1907
1992
  "filePath": "merge-lanes.main.runtime.ts",
1908
- "line": 69,
1993
+ "line": 70,
1909
1994
  "character": 21
1910
1995
  },
1911
1996
  "name": "ComponentID",
@@ -1922,7 +2007,7 @@
1922
2007
  "__schema": "VariableLikeSchema",
1923
2008
  "location": {
1924
2009
  "filePath": "merge-lanes.main.runtime.ts",
1925
- "line": 70,
2010
+ "line": 71,
1926
2011
  "character": 3
1927
2012
  },
1928
2013
  "signature": "(property) mergeSnapError?: Error | undefined",
@@ -1931,7 +2016,7 @@
1931
2016
  "__schema": "TypeRefSchema",
1932
2017
  "location": {
1933
2018
  "filePath": "merge-lanes.main.runtime.ts",
1934
- "line": 70,
2019
+ "line": 71,
1935
2020
  "character": 20
1936
2021
  },
1937
2022
  "name": "Error"
@@ -1945,7 +2030,7 @@
1945
2030
  "__schema": "ClassSchema",
1946
2031
  "location": {
1947
2032
  "filePath": "merge-lanes.main.runtime.ts",
1948
- "line": 73,
2033
+ "line": 74,
1949
2034
  "character": 1
1950
2035
  },
1951
2036
  "signature": "class MergeLanesMain",
@@ -1955,7 +2040,7 @@
1955
2040
  "__schema": "ConstructorSchema",
1956
2041
  "location": {
1957
2042
  "filePath": "merge-lanes.main.runtime.ts",
1958
- "line": 74,
2043
+ "line": 75,
1959
2044
  "character": 3
1960
2045
  },
1961
2046
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1965,7 +2050,7 @@
1965
2050
  "__schema": "ParameterSchema",
1966
2051
  "location": {
1967
2052
  "filePath": "merge-lanes.main.runtime.ts",
1968
- "line": 75,
2053
+ "line": 76,
1969
2054
  "character": 5
1970
2055
  },
1971
2056
  "name": "workspace",
@@ -1973,7 +2058,7 @@
1973
2058
  "__schema": "TypeUnionSchema",
1974
2059
  "location": {
1975
2060
  "filePath": "merge-lanes.main.runtime.ts",
1976
- "line": 75,
2061
+ "line": 76,
1977
2062
  "character": 24
1978
2063
  },
1979
2064
  "types": [
@@ -1981,7 +2066,7 @@
1981
2066
  "__schema": "TypeRefSchema",
1982
2067
  "location": {
1983
2068
  "filePath": "merge-lanes.main.runtime.ts",
1984
- "line": 75,
2069
+ "line": 76,
1985
2070
  "character": 24
1986
2071
  },
1987
2072
  "name": "Workspace",
@@ -1994,7 +2079,7 @@
1994
2079
  "__schema": "KeywordTypeSchema",
1995
2080
  "location": {
1996
2081
  "filePath": "merge-lanes.main.runtime.ts",
1997
- "line": 75,
2082
+ "line": 76,
1998
2083
  "character": 36
1999
2084
  },
2000
2085
  "name": "undefined"
@@ -2008,7 +2093,7 @@
2008
2093
  "__schema": "ParameterSchema",
2009
2094
  "location": {
2010
2095
  "filePath": "merge-lanes.main.runtime.ts",
2011
- "line": 76,
2096
+ "line": 77,
2012
2097
  "character": 5
2013
2098
  },
2014
2099
  "name": "merging",
@@ -2016,7 +2101,7 @@
2016
2101
  "__schema": "TypeRefSchema",
2017
2102
  "location": {
2018
2103
  "filePath": "merge-lanes.main.runtime.ts",
2019
- "line": 76,
2104
+ "line": 77,
2020
2105
  "character": 22
2021
2106
  },
2022
2107
  "name": "MergingMain",
@@ -2032,7 +2117,7 @@
2032
2117
  "__schema": "ParameterSchema",
2033
2118
  "location": {
2034
2119
  "filePath": "merge-lanes.main.runtime.ts",
2035
- "line": 77,
2120
+ "line": 78,
2036
2121
  "character": 5
2037
2122
  },
2038
2123
  "name": "lanes",
@@ -2040,8 +2125,8 @@
2040
2125
  "__schema": "TypeRefSchema",
2041
2126
  "location": {
2042
2127
  "filePath": "merge-lanes.main.runtime.ts",
2043
- "line": 77,
2044
- "character": 20
2128
+ "line": 78,
2129
+ "character": 21
2045
2130
  },
2046
2131
  "name": "LanesMain",
2047
2132
  "componentId": {
@@ -2056,7 +2141,7 @@
2056
2141
  "__schema": "ParameterSchema",
2057
2142
  "location": {
2058
2143
  "filePath": "merge-lanes.main.runtime.ts",
2059
- "line": 78,
2144
+ "line": 79,
2060
2145
  "character": 5
2061
2146
  },
2062
2147
  "name": "logger",
@@ -2064,7 +2149,7 @@
2064
2149
  "__schema": "TypeRefSchema",
2065
2150
  "location": {
2066
2151
  "filePath": "merge-lanes.main.runtime.ts",
2067
- "line": 78,
2152
+ "line": 79,
2068
2153
  "character": 22
2069
2154
  },
2070
2155
  "name": "Logger",
@@ -2080,7 +2165,7 @@
2080
2165
  "__schema": "ParameterSchema",
2081
2166
  "location": {
2082
2167
  "filePath": "merge-lanes.main.runtime.ts",
2083
- "line": 79,
2168
+ "line": 80,
2084
2169
  "character": 5
2085
2170
  },
2086
2171
  "name": "remove",
@@ -2088,7 +2173,7 @@
2088
2173
  "__schema": "TypeRefSchema",
2089
2174
  "location": {
2090
2175
  "filePath": "merge-lanes.main.runtime.ts",
2091
- "line": 79,
2176
+ "line": 80,
2092
2177
  "character": 21
2093
2178
  },
2094
2179
  "name": "RemoveMain",
@@ -2104,7 +2189,7 @@
2104
2189
  "__schema": "ParameterSchema",
2105
2190
  "location": {
2106
2191
  "filePath": "merge-lanes.main.runtime.ts",
2107
- "line": 80,
2192
+ "line": 81,
2108
2193
  "character": 5
2109
2194
  },
2110
2195
  "name": "scope",
@@ -2112,7 +2197,7 @@
2112
2197
  "__schema": "TypeRefSchema",
2113
2198
  "location": {
2114
2199
  "filePath": "merge-lanes.main.runtime.ts",
2115
- "line": 80,
2200
+ "line": 81,
2116
2201
  "character": 20
2117
2202
  },
2118
2203
  "name": "ScopeMain",
@@ -2128,7 +2213,7 @@
2128
2213
  "__schema": "ParameterSchema",
2129
2214
  "location": {
2130
2215
  "filePath": "merge-lanes.main.runtime.ts",
2131
- "line": 81,
2216
+ "line": 82,
2132
2217
  "character": 5
2133
2218
  },
2134
2219
  "name": "exporter",
@@ -2136,7 +2221,7 @@
2136
2221
  "__schema": "TypeRefSchema",
2137
2222
  "location": {
2138
2223
  "filePath": "merge-lanes.main.runtime.ts",
2139
- "line": 81,
2224
+ "line": 82,
2140
2225
  "character": 23
2141
2226
  },
2142
2227
  "name": "ExportMain",
@@ -2152,7 +2237,7 @@
2152
2237
  "__schema": "ParameterSchema",
2153
2238
  "location": {
2154
2239
  "filePath": "merge-lanes.main.runtime.ts",
2155
- "line": 82,
2240
+ "line": 83,
2156
2241
  "character": 5
2157
2242
  },
2158
2243
  "name": "importer",
@@ -2160,7 +2245,7 @@
2160
2245
  "__schema": "TypeRefSchema",
2161
2246
  "location": {
2162
2247
  "filePath": "merge-lanes.main.runtime.ts",
2163
- "line": 82,
2248
+ "line": 83,
2164
2249
  "character": 23
2165
2250
  },
2166
2251
  "name": "ImporterMain",
@@ -2176,7 +2261,7 @@
2176
2261
  "__schema": "ParameterSchema",
2177
2262
  "location": {
2178
2263
  "filePath": "merge-lanes.main.runtime.ts",
2179
- "line": 83,
2264
+ "line": 84,
2180
2265
  "character": 5
2181
2266
  },
2182
2267
  "name": "checkout",
@@ -2184,7 +2269,7 @@
2184
2269
  "__schema": "TypeRefSchema",
2185
2270
  "location": {
2186
2271
  "filePath": "merge-lanes.main.runtime.ts",
2187
- "line": 83,
2272
+ "line": 84,
2188
2273
  "character": 23
2189
2274
  },
2190
2275
  "name": "CheckoutMain",
@@ -2201,7 +2286,7 @@
2201
2286
  "__schema": "ThisTypeSchema",
2202
2287
  "location": {
2203
2288
  "filePath": "merge-lanes.main.runtime.ts",
2204
- "line": 73,
2289
+ "line": 74,
2205
2290
  "character": 1
2206
2291
  },
2207
2292
  "name": "MergeLanesMain"
@@ -2212,7 +2297,7 @@
2212
2297
  "__schema": "FunctionLikeSchema",
2213
2298
  "location": {
2214
2299
  "filePath": "merge-lanes.main.runtime.ts",
2215
- "line": 86,
2300
+ "line": 87,
2216
2301
  "character": 3
2217
2302
  },
2218
2303
  "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}>",
@@ -2222,7 +2307,7 @@
2222
2307
  "__schema": "ParameterSchema",
2223
2308
  "location": {
2224
2309
  "filePath": "merge-lanes.main.runtime.ts",
2225
- "line": 86,
2310
+ "line": 87,
2226
2311
  "character": 24
2227
2312
  },
2228
2313
  "name": "laneName",
@@ -2230,7 +2315,7 @@
2230
2315
  "__schema": "KeywordTypeSchema",
2231
2316
  "location": {
2232
2317
  "filePath": "merge-lanes.main.runtime.ts",
2233
- "line": 86,
2318
+ "line": 87,
2234
2319
  "character": 34
2235
2320
  },
2236
2321
  "name": "string"
@@ -2242,7 +2327,7 @@
2242
2327
  "__schema": "ParameterSchema",
2243
2328
  "location": {
2244
2329
  "filePath": "merge-lanes.main.runtime.ts",
2245
- "line": 86,
2330
+ "line": 87,
2246
2331
  "character": 42
2247
2332
  },
2248
2333
  "name": "options",
@@ -2250,7 +2335,7 @@
2250
2335
  "__schema": "TypeRefSchema",
2251
2336
  "location": {
2252
2337
  "filePath": "merge-lanes.main.runtime.ts",
2253
- "line": 86,
2338
+ "line": 87,
2254
2339
  "character": 51
2255
2340
  },
2256
2341
  "name": "MergeLaneOptions",
@@ -2264,7 +2349,7 @@
2264
2349
  "__schema": "InferenceTypeSchema",
2265
2350
  "location": {
2266
2351
  "filePath": "merge-lanes.main.runtime.ts",
2267
- "line": 86,
2352
+ "line": 87,
2268
2353
  "character": 3
2269
2354
  },
2270
2355
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
@@ -2277,7 +2362,7 @@
2277
2362
  "__schema": "FunctionLikeSchema",
2278
2363
  "location": {
2279
2364
  "filePath": "merge-lanes.main.runtime.ts",
2280
- "line": 96,
2365
+ "line": 97,
2281
2366
  "character": 3
2282
2367
  },
2283
2368
  "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}>",
@@ -2287,7 +2372,7 @@
2287
2372
  "__schema": "ParameterSchema",
2288
2373
  "location": {
2289
2374
  "filePath": "merge-lanes.main.runtime.ts",
2290
- "line": 97,
2375
+ "line": 98,
2291
2376
  "character": 5
2292
2377
  },
2293
2378
  "name": "otherLaneId",
@@ -2295,7 +2380,7 @@
2295
2380
  "__schema": "TypeRefSchema",
2296
2381
  "location": {
2297
2382
  "filePath": "merge-lanes.main.runtime.ts",
2298
- "line": 97,
2383
+ "line": 98,
2299
2384
  "character": 18
2300
2385
  },
2301
2386
  "name": "LaneId",
@@ -2312,7 +2397,7 @@
2312
2397
  "__schema": "ParameterSchema",
2313
2398
  "location": {
2314
2399
  "filePath": "merge-lanes.main.runtime.ts",
2315
- "line": 98,
2400
+ "line": 99,
2316
2401
  "character": 5
2317
2402
  },
2318
2403
  "name": "currentLaneId",
@@ -2320,7 +2405,7 @@
2320
2405
  "__schema": "TypeRefSchema",
2321
2406
  "location": {
2322
2407
  "filePath": "merge-lanes.main.runtime.ts",
2323
- "line": 98,
2408
+ "line": 99,
2324
2409
  "character": 20
2325
2410
  },
2326
2411
  "name": "LaneId",
@@ -2337,7 +2422,7 @@
2337
2422
  "__schema": "ParameterSchema",
2338
2423
  "location": {
2339
2424
  "filePath": "merge-lanes.main.runtime.ts",
2340
- "line": 99,
2425
+ "line": 100,
2341
2426
  "character": 5
2342
2427
  },
2343
2428
  "name": "options",
@@ -2345,7 +2430,7 @@
2345
2430
  "__schema": "TypeRefSchema",
2346
2431
  "location": {
2347
2432
  "filePath": "merge-lanes.main.runtime.ts",
2348
- "line": 99,
2433
+ "line": 100,
2349
2434
  "character": 14
2350
2435
  },
2351
2436
  "name": "MergeLaneOptions",
@@ -2359,7 +2444,7 @@
2359
2444
  "__schema": "TypeRefSchema",
2360
2445
  "location": {
2361
2446
  "filePath": "merge-lanes.main.runtime.ts",
2362
- "line": 100,
2447
+ "line": 101,
2363
2448
  "character": 6
2364
2449
  },
2365
2450
  "name": "Promise",
@@ -2368,7 +2453,7 @@
2368
2453
  "__schema": "TypeLiteralSchema",
2369
2454
  "location": {
2370
2455
  "filePath": "merge-lanes.main.runtime.ts",
2371
- "line": 100,
2456
+ "line": 101,
2372
2457
  "character": 14
2373
2458
  },
2374
2459
  "members": [
@@ -2376,7 +2461,7 @@
2376
2461
  "__schema": "VariableLikeSchema",
2377
2462
  "location": {
2378
2463
  "filePath": "merge-lanes.main.runtime.ts",
2379
- "line": 101,
2464
+ "line": 102,
2380
2465
  "character": 5
2381
2466
  },
2382
2467
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -2385,7 +2470,7 @@
2385
2470
  "__schema": "TypeRefSchema",
2386
2471
  "location": {
2387
2472
  "filePath": "merge-lanes.main.runtime.ts",
2388
- "line": 101,
2473
+ "line": 102,
2389
2474
  "character": 5
2390
2475
  },
2391
2476
  "name": "ApplyVersionResults",
@@ -2400,7 +2485,7 @@
2400
2485
  "__schema": "VariableLikeSchema",
2401
2486
  "location": {
2402
2487
  "filePath": "merge-lanes.main.runtime.ts",
2403
- "line": 102,
2488
+ "line": 103,
2404
2489
  "character": 5
2405
2490
  },
2406
2491
  "signature": "(property) deleteResults: any",
@@ -2409,7 +2494,7 @@
2409
2494
  "__schema": "KeywordTypeSchema",
2410
2495
  "location": {
2411
2496
  "filePath": "merge-lanes.main.runtime.ts",
2412
- "line": 102,
2497
+ "line": 103,
2413
2498
  "character": 20
2414
2499
  },
2415
2500
  "name": "any"
@@ -2420,7 +2505,7 @@
2420
2505
  "__schema": "VariableLikeSchema",
2421
2506
  "location": {
2422
2507
  "filePath": "merge-lanes.main.runtime.ts",
2423
- "line": 103,
2508
+ "line": 104,
2424
2509
  "character": 5
2425
2510
  },
2426
2511
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -2429,14 +2514,14 @@
2429
2514
  "__schema": "TypeArraySchema",
2430
2515
  "location": {
2431
2516
  "filePath": "merge-lanes.main.runtime.ts",
2432
- "line": 103,
2517
+ "line": 104,
2433
2518
  "character": 25
2434
2519
  },
2435
2520
  "type": {
2436
2521
  "__schema": "TypeRefSchema",
2437
2522
  "location": {
2438
2523
  "filePath": "merge-lanes.main.runtime.ts",
2439
- "line": 103,
2524
+ "line": 104,
2440
2525
  "character": 25
2441
2526
  },
2442
2527
  "name": "ConfigMergeResult",
@@ -2452,7 +2537,7 @@
2452
2537
  "__schema": "VariableLikeSchema",
2453
2538
  "location": {
2454
2539
  "filePath": "merge-lanes.main.runtime.ts",
2455
- "line": 104,
2540
+ "line": 105,
2456
2541
  "character": 5
2457
2542
  },
2458
2543
  "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -2461,14 +2546,14 @@
2461
2546
  "__schema": "TypeArraySchema",
2462
2547
  "location": {
2463
2548
  "filePath": "merge-lanes.main.runtime.ts",
2464
- "line": 104,
2549
+ "line": 105,
2465
2550
  "character": 28
2466
2551
  },
2467
2552
  "type": {
2468
2553
  "__schema": "TypeRefSchema",
2469
2554
  "location": {
2470
2555
  "filePath": "merge-lanes.main.runtime.ts",
2471
- "line": 104,
2556
+ "line": 105,
2472
2557
  "character": 28
2473
2558
  },
2474
2559
  "name": "ComponentID",
@@ -2485,7 +2570,7 @@
2485
2570
  "__schema": "VariableLikeSchema",
2486
2571
  "location": {
2487
2572
  "filePath": "merge-lanes.main.runtime.ts",
2488
- "line": 105,
2573
+ "line": 106,
2489
2574
  "character": 5
2490
2575
  },
2491
2576
  "signature": "(property) conflicts: ConflictPerId[]",
@@ -2494,14 +2579,14 @@
2494
2579
  "__schema": "TypeArraySchema",
2495
2580
  "location": {
2496
2581
  "filePath": "merge-lanes.main.runtime.ts",
2497
- "line": 105,
2582
+ "line": 106,
2498
2583
  "character": 16
2499
2584
  },
2500
2585
  "type": {
2501
2586
  "__schema": "TypeRefSchema",
2502
2587
  "location": {
2503
2588
  "filePath": "merge-lanes.main.runtime.ts",
2504
- "line": 105,
2589
+ "line": 106,
2505
2590
  "character": 16
2506
2591
  },
2507
2592
  "name": "ConflictPerId",
@@ -2522,7 +2607,92 @@
2522
2607
  "__schema": "FunctionLikeSchema",
2523
2608
  "location": {
2524
2609
  "filePath": "merge-lanes.main.runtime.ts",
2525
- "line": 318,
2610
+ "line": 319,
2611
+ "character": 3
2612
+ },
2613
+ "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
2614
+ "name": "mergeMove",
2615
+ "params": [
2616
+ {
2617
+ "__schema": "ParameterSchema",
2618
+ "location": {
2619
+ "filePath": "merge-lanes.main.runtime.ts",
2620
+ "line": 319,
2621
+ "character": 19
2622
+ },
2623
+ "name": "newLaneName",
2624
+ "type": {
2625
+ "__schema": "KeywordTypeSchema",
2626
+ "location": {
2627
+ "filePath": "merge-lanes.main.runtime.ts",
2628
+ "line": 319,
2629
+ "character": 32
2630
+ },
2631
+ "name": "string"
2632
+ },
2633
+ "isOptional": false,
2634
+ "isSpread": false
2635
+ },
2636
+ {
2637
+ "__schema": "ParameterSchema",
2638
+ "location": {
2639
+ "filePath": "merge-lanes.main.runtime.ts",
2640
+ "line": 319,
2641
+ "character": 40
2642
+ },
2643
+ "name": "options",
2644
+ "type": {
2645
+ "__schema": "TypeLiteralSchema",
2646
+ "location": {
2647
+ "filePath": "merge-lanes.main.runtime.ts",
2648
+ "line": 319,
2649
+ "character": 49
2650
+ },
2651
+ "members": [
2652
+ {
2653
+ "__schema": "VariableLikeSchema",
2654
+ "location": {
2655
+ "filePath": "merge-lanes.main.runtime.ts",
2656
+ "line": 319,
2657
+ "character": 51
2658
+ },
2659
+ "signature": "(property) scope?: string | undefined",
2660
+ "name": "scope",
2661
+ "type": {
2662
+ "__schema": "KeywordTypeSchema",
2663
+ "location": {
2664
+ "filePath": "merge-lanes.main.runtime.ts",
2665
+ "line": 319,
2666
+ "character": 59
2667
+ },
2668
+ "name": "string"
2669
+ },
2670
+ "isOptional": true
2671
+ }
2672
+ ]
2673
+ },
2674
+ "isOptional": false,
2675
+ "isSpread": false
2676
+ }
2677
+ ],
2678
+ "returnType": {
2679
+ "__schema": "InferenceTypeSchema",
2680
+ "location": {
2681
+ "filePath": "merge-lanes.main.runtime.ts",
2682
+ "line": 319,
2683
+ "character": 3
2684
+ },
2685
+ "type": "Promise<CreateLaneResult>"
2686
+ },
2687
+ "modifiers": [
2688
+ "async"
2689
+ ]
2690
+ },
2691
+ {
2692
+ "__schema": "FunctionLikeSchema",
2693
+ "location": {
2694
+ "filePath": "merge-lanes.main.runtime.ts",
2695
+ "line": 327,
2526
2696
  "character": 3
2527
2697
  },
2528
2698
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2532,7 +2702,7 @@
2532
2702
  "__schema": "ParameterSchema",
2533
2703
  "location": {
2534
2704
  "filePath": "merge-lanes.main.runtime.ts",
2535
- "line": 318,
2705
+ "line": 327,
2536
2706
  "character": 24
2537
2707
  },
2538
2708
  "name": "checkoutProps",
@@ -2540,7 +2710,7 @@
2540
2710
  "__schema": "TypeRefSchema",
2541
2711
  "location": {
2542
2712
  "filePath": "merge-lanes.main.runtime.ts",
2543
- "line": 318,
2713
+ "line": 327,
2544
2714
  "character": 39
2545
2715
  },
2546
2716
  "name": "CheckoutProps",
@@ -2556,7 +2726,7 @@
2556
2726
  "__schema": "ParameterSchema",
2557
2727
  "location": {
2558
2728
  "filePath": "merge-lanes.main.runtime.ts",
2559
- "line": 318,
2729
+ "line": 327,
2560
2730
  "character": 54
2561
2731
  },
2562
2732
  "name": "mergeAbortOpts",
@@ -2564,7 +2734,7 @@
2564
2734
  "__schema": "TypeRefSchema",
2565
2735
  "location": {
2566
2736
  "filePath": "merge-lanes.main.runtime.ts",
2567
- "line": 318,
2737
+ "line": 327,
2568
2738
  "character": 70
2569
2739
  },
2570
2740
  "name": "MergeAbortOpts",
@@ -2578,7 +2748,7 @@
2578
2748
  "__schema": "InferenceTypeSchema",
2579
2749
  "location": {
2580
2750
  "filePath": "merge-lanes.main.runtime.ts",
2581
- "line": 318,
2751
+ "line": 327,
2582
2752
  "character": 3
2583
2753
  },
2584
2754
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2591,7 +2761,7 @@
2591
2761
  "__schema": "FunctionLikeSchema",
2592
2762
  "location": {
2593
2763
  "filePath": "merge-lanes.main.runtime.ts",
2594
- "line": 374,
2764
+ "line": 383,
2595
2765
  "character": 3
2596
2766
  },
2597
2767
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2601,7 +2771,7 @@
2601
2771
  "__schema": "ParameterSchema",
2602
2772
  "location": {
2603
2773
  "filePath": "merge-lanes.main.runtime.ts",
2604
- "line": 375,
2774
+ "line": 384,
2605
2775
  "character": 5
2606
2776
  },
2607
2777
  "name": "fromLane",
@@ -2609,7 +2779,7 @@
2609
2779
  "__schema": "KeywordTypeSchema",
2610
2780
  "location": {
2611
2781
  "filePath": "merge-lanes.main.runtime.ts",
2612
- "line": 375,
2782
+ "line": 384,
2613
2783
  "character": 15
2614
2784
  },
2615
2785
  "name": "string"
@@ -2621,7 +2791,7 @@
2621
2791
  "__schema": "ParameterSchema",
2622
2792
  "location": {
2623
2793
  "filePath": "merge-lanes.main.runtime.ts",
2624
- "line": 376,
2794
+ "line": 385,
2625
2795
  "character": 5
2626
2796
  },
2627
2797
  "name": "toLane",
@@ -2629,7 +2799,7 @@
2629
2799
  "__schema": "KeywordTypeSchema",
2630
2800
  "location": {
2631
2801
  "filePath": "merge-lanes.main.runtime.ts",
2632
- "line": 376,
2802
+ "line": 385,
2633
2803
  "character": 13
2634
2804
  },
2635
2805
  "name": "string"
@@ -2641,7 +2811,7 @@
2641
2811
  "__schema": "ParameterSchema",
2642
2812
  "location": {
2643
2813
  "filePath": "merge-lanes.main.runtime.ts",
2644
- "line": 377,
2814
+ "line": 386,
2645
2815
  "character": 5
2646
2816
  },
2647
2817
  "name": "options",
@@ -2649,7 +2819,7 @@
2649
2819
  "__schema": "TypeIntersectionSchema",
2650
2820
  "location": {
2651
2821
  "filePath": "merge-lanes.main.runtime.ts",
2652
- "line": 377,
2822
+ "line": 386,
2653
2823
  "character": 14
2654
2824
  },
2655
2825
  "types": [
@@ -2657,7 +2827,7 @@
2657
2827
  "__schema": "TypeRefSchema",
2658
2828
  "location": {
2659
2829
  "filePath": "merge-lanes.main.runtime.ts",
2660
- "line": 377,
2830
+ "line": 386,
2661
2831
  "character": 14
2662
2832
  },
2663
2833
  "name": "Partial",
@@ -2666,7 +2836,7 @@
2666
2836
  "__schema": "TypeRefSchema",
2667
2837
  "location": {
2668
2838
  "filePath": "merge-lanes.main.runtime.ts",
2669
- "line": 377,
2839
+ "line": 386,
2670
2840
  "character": 22
2671
2841
  },
2672
2842
  "name": "MergeLaneOptions",
@@ -2678,7 +2848,7 @@
2678
2848
  "__schema": "TypeLiteralSchema",
2679
2849
  "location": {
2680
2850
  "filePath": "merge-lanes.main.runtime.ts",
2681
- "line": 377,
2851
+ "line": 386,
2682
2852
  "character": 42
2683
2853
  },
2684
2854
  "members": [
@@ -2686,7 +2856,7 @@
2686
2856
  "__schema": "VariableLikeSchema",
2687
2857
  "location": {
2688
2858
  "filePath": "merge-lanes.main.runtime.ts",
2689
- "line": 377,
2859
+ "line": 386,
2690
2860
  "character": 44
2691
2861
  },
2692
2862
  "signature": "(property) push?: boolean | undefined",
@@ -2695,7 +2865,7 @@
2695
2865
  "__schema": "KeywordTypeSchema",
2696
2866
  "location": {
2697
2867
  "filePath": "merge-lanes.main.runtime.ts",
2698
- "line": 377,
2868
+ "line": 386,
2699
2869
  "character": 51
2700
2870
  },
2701
2871
  "name": "boolean"
@@ -2706,7 +2876,7 @@
2706
2876
  "__schema": "VariableLikeSchema",
2707
2877
  "location": {
2708
2878
  "filePath": "merge-lanes.main.runtime.ts",
2709
- "line": 377,
2879
+ "line": 386,
2710
2880
  "character": 60
2711
2881
  },
2712
2882
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2715,7 +2885,7 @@
2715
2885
  "__schema": "KeywordTypeSchema",
2716
2886
  "location": {
2717
2887
  "filePath": "merge-lanes.main.runtime.ts",
2718
- "line": 377,
2888
+ "line": 386,
2719
2889
  "character": 70
2720
2890
  },
2721
2891
  "name": "boolean"
@@ -2734,7 +2904,7 @@
2734
2904
  "__schema": "TypeRefSchema",
2735
2905
  "location": {
2736
2906
  "filePath": "merge-lanes.main.runtime.ts",
2737
- "line": 378,
2907
+ "line": 387,
2738
2908
  "character": 6
2739
2909
  },
2740
2910
  "name": "Promise",
@@ -2743,7 +2913,7 @@
2743
2913
  "__schema": "TypeRefSchema",
2744
2914
  "location": {
2745
2915
  "filePath": "merge-lanes.main.runtime.ts",
2746
- "line": 378,
2916
+ "line": 387,
2747
2917
  "character": 14
2748
2918
  },
2749
2919
  "name": "MergeFromScopeResult",
@@ -2759,7 +2929,7 @@
2759
2929
  "__schema": "VariableLikeSchema",
2760
2930
  "location": {
2761
2931
  "filePath": "merge-lanes.main.runtime.ts",
2762
- "line": 472,
2932
+ "line": 481,
2763
2933
  "character": 3
2764
2934
  },
2765
2935
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2768,7 +2938,7 @@
2768
2938
  "__schema": "InferenceTypeSchema",
2769
2939
  "location": {
2770
2940
  "filePath": "merge-lanes.main.runtime.ts",
2771
- "line": 472,
2941
+ "line": 481,
2772
2942
  "character": 3
2773
2943
  },
2774
2944
  "type": "never[]"
@@ -2780,7 +2950,7 @@
2780
2950
  "__schema": "VariableLikeSchema",
2781
2951
  "location": {
2782
2952
  "filePath": "merge-lanes.main.runtime.ts",
2783
- "line": 473,
2953
+ "line": 482,
2784
2954
  "character": 3
2785
2955
  },
2786
2956
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2789,7 +2959,7 @@
2789
2959
  "__schema": "InferenceTypeSchema",
2790
2960
  "location": {
2791
2961
  "filePath": "merge-lanes.main.runtime.ts",
2792
- "line": 473,
2962
+ "line": 482,
2793
2963
  "character": 3
2794
2964
  },
2795
2965
  "type": "Aspect[]"
@@ -2801,7 +2971,7 @@
2801
2971
  "__schema": "VariableLikeSchema",
2802
2972
  "location": {
2803
2973
  "filePath": "merge-lanes.main.runtime.ts",
2804
- "line": 486,
2974
+ "line": 495,
2805
2975
  "character": 3
2806
2976
  },
2807
2977
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2810,7 +2980,7 @@
2810
2980
  "__schema": "InferenceTypeSchema",
2811
2981
  "location": {
2812
2982
  "filePath": "merge-lanes.main.runtime.ts",
2813
- "line": 486,
2983
+ "line": 495,
2814
2984
  "character": 3
2815
2985
  },
2816
2986
  "type": "RuntimeDefinition"
@@ -2822,7 +2992,7 @@
2822
2992
  "__schema": "FunctionLikeSchema",
2823
2993
  "location": {
2824
2994
  "filePath": "merge-lanes.main.runtime.ts",
2825
- "line": 488,
2995
+ "line": 497,
2826
2996
  "character": 3
2827
2997
  },
2828
2998
  "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>",
@@ -2832,7 +3002,7 @@
2832
3002
  "__schema": "ParameterSchema",
2833
3003
  "location": {
2834
3004
  "filePath": "merge-lanes.main.runtime.ts",
2835
- "line": 488,
3005
+ "line": 497,
2836
3006
  "character": 25
2837
3007
  },
2838
3008
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2840,7 +3010,7 @@
2840
3010
  "__schema": "TupleTypeSchema",
2841
3011
  "location": {
2842
3012
  "filePath": "merge-lanes.main.runtime.ts",
2843
- "line": 500,
3013
+ "line": 509,
2844
3014
  "character": 6
2845
3015
  },
2846
3016
  "elements": [
@@ -2848,7 +3018,7 @@
2848
3018
  "__schema": "TypeRefSchema",
2849
3019
  "location": {
2850
3020
  "filePath": "merge-lanes.main.runtime.ts",
2851
- "line": 501,
3021
+ "line": 510,
2852
3022
  "character": 5
2853
3023
  },
2854
3024
  "name": "LanesMain",
@@ -2861,7 +3031,7 @@
2861
3031
  "__schema": "TypeRefSchema",
2862
3032
  "location": {
2863
3033
  "filePath": "merge-lanes.main.runtime.ts",
2864
- "line": 502,
3034
+ "line": 511,
2865
3035
  "character": 5
2866
3036
  },
2867
3037
  "name": "CLIMain",
@@ -2874,7 +3044,7 @@
2874
3044
  "__schema": "TypeRefSchema",
2875
3045
  "location": {
2876
3046
  "filePath": "merge-lanes.main.runtime.ts",
2877
- "line": 503,
3047
+ "line": 512,
2878
3048
  "character": 5
2879
3049
  },
2880
3050
  "name": "Workspace",
@@ -2887,7 +3057,7 @@
2887
3057
  "__schema": "TypeRefSchema",
2888
3058
  "location": {
2889
3059
  "filePath": "merge-lanes.main.runtime.ts",
2890
- "line": 504,
3060
+ "line": 513,
2891
3061
  "character": 5
2892
3062
  },
2893
3063
  "name": "MergingMain",
@@ -2900,7 +3070,7 @@
2900
3070
  "__schema": "TypeRefSchema",
2901
3071
  "location": {
2902
3072
  "filePath": "merge-lanes.main.runtime.ts",
2903
- "line": 505,
3073
+ "line": 514,
2904
3074
  "character": 5
2905
3075
  },
2906
3076
  "name": "LoggerMain",
@@ -2913,7 +3083,7 @@
2913
3083
  "__schema": "TypeRefSchema",
2914
3084
  "location": {
2915
3085
  "filePath": "merge-lanes.main.runtime.ts",
2916
- "line": 506,
3086
+ "line": 515,
2917
3087
  "character": 5
2918
3088
  },
2919
3089
  "name": "RemoveMain",
@@ -2926,7 +3096,7 @@
2926
3096
  "__schema": "TypeRefSchema",
2927
3097
  "location": {
2928
3098
  "filePath": "merge-lanes.main.runtime.ts",
2929
- "line": 507,
3099
+ "line": 516,
2930
3100
  "character": 5
2931
3101
  },
2932
3102
  "name": "ScopeMain",
@@ -2939,7 +3109,7 @@
2939
3109
  "__schema": "TypeRefSchema",
2940
3110
  "location": {
2941
3111
  "filePath": "merge-lanes.main.runtime.ts",
2942
- "line": 508,
3112
+ "line": 517,
2943
3113
  "character": 5
2944
3114
  },
2945
3115
  "name": "ExportMain",
@@ -2952,7 +3122,7 @@
2952
3122
  "__schema": "TypeRefSchema",
2953
3123
  "location": {
2954
3124
  "filePath": "merge-lanes.main.runtime.ts",
2955
- "line": 509,
3125
+ "line": 518,
2956
3126
  "character": 5
2957
3127
  },
2958
3128
  "name": "ImporterMain",
@@ -2965,7 +3135,7 @@
2965
3135
  "__schema": "TypeRefSchema",
2966
3136
  "location": {
2967
3137
  "filePath": "merge-lanes.main.runtime.ts",
2968
- "line": 510,
3138
+ "line": 519,
2969
3139
  "character": 5
2970
3140
  },
2971
3141
  "name": "CheckoutMain",
@@ -2978,7 +3148,7 @@
2978
3148
  "__schema": "TypeRefSchema",
2979
3149
  "location": {
2980
3150
  "filePath": "merge-lanes.main.runtime.ts",
2981
- "line": 511,
3151
+ "line": 520,
2982
3152
  "character": 5
2983
3153
  },
2984
3154
  "name": "GlobalConfigMain",
@@ -2997,7 +3167,7 @@
2997
3167
  "__schema": "InferenceTypeSchema",
2998
3168
  "location": {
2999
3169
  "filePath": "merge-lanes.main.runtime.ts",
3000
- "line": 488,
3170
+ "line": 497,
3001
3171
  "character": 3
3002
3172
  },
3003
3173
  "type": "Promise<MergeLanesMain>"
@@ -3015,7 +3185,7 @@
3015
3185
  "__schema": "UnImplementedSchema",
3016
3186
  "location": {
3017
3187
  "filePath": "merge-lanes.main.runtime.ts",
3018
- "line": 782,
3188
+ "line": 792,
3019
3189
  "character": 16
3020
3190
  },
3021
3191
  "name": "MergeLanesMain",
@@ -3027,7 +3197,7 @@
3027
3197
  "__schema": "FunctionLikeSchema",
3028
3198
  "location": {
3029
3199
  "filePath": "merge-lanes.main.runtime.ts",
3030
- "line": 533,
3200
+ "line": 543,
3031
3201
  "character": 1
3032
3202
  },
3033
3203
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -3037,7 +3207,7 @@
3037
3207
  "__schema": "ParameterSchema",
3038
3208
  "location": {
3039
3209
  "filePath": "merge-lanes.main.runtime.ts",
3040
- "line": 534,
3210
+ "line": 544,
3041
3211
  "character": 3
3042
3212
  },
3043
3213
  "name": "allComponentsStatus",
@@ -3045,14 +3215,14 @@
3045
3215
  "__schema": "TypeArraySchema",
3046
3216
  "location": {
3047
3217
  "filePath": "merge-lanes.main.runtime.ts",
3048
- "line": 534,
3218
+ "line": 544,
3049
3219
  "character": 24
3050
3220
  },
3051
3221
  "type": {
3052
3222
  "__schema": "TypeRefSchema",
3053
3223
  "location": {
3054
3224
  "filePath": "merge-lanes.main.runtime.ts",
3055
- "line": 534,
3225
+ "line": 544,
3056
3226
  "character": 24
3057
3227
  },
3058
3228
  "name": "ComponentMergeStatus",
@@ -3069,7 +3239,7 @@
3069
3239
  "__schema": "ParameterSchema",
3070
3240
  "location": {
3071
3241
  "filePath": "merge-lanes.main.runtime.ts",
3072
- "line": 535,
3242
+ "line": 545,
3073
3243
  "character": 3
3074
3244
  },
3075
3245
  "name": "compIdsToKeep",
@@ -3077,14 +3247,14 @@
3077
3247
  "__schema": "TypeArraySchema",
3078
3248
  "location": {
3079
3249
  "filePath": "merge-lanes.main.runtime.ts",
3080
- "line": 535,
3250
+ "line": 545,
3081
3251
  "character": 18
3082
3252
  },
3083
3253
  "type": {
3084
3254
  "__schema": "TypeRefSchema",
3085
3255
  "location": {
3086
3256
  "filePath": "merge-lanes.main.runtime.ts",
3087
- "line": 535,
3257
+ "line": 545,
3088
3258
  "character": 18
3089
3259
  },
3090
3260
  "name": "ComponentID",
@@ -3102,7 +3272,7 @@
3102
3272
  "__schema": "ParameterSchema",
3103
3273
  "location": {
3104
3274
  "filePath": "merge-lanes.main.runtime.ts",
3105
- "line": 536,
3275
+ "line": 546,
3106
3276
  "character": 3
3107
3277
  },
3108
3278
  "name": "allBitIds",
@@ -3110,14 +3280,14 @@
3110
3280
  "__schema": "TypeArraySchema",
3111
3281
  "location": {
3112
3282
  "filePath": "merge-lanes.main.runtime.ts",
3113
- "line": 536,
3283
+ "line": 546,
3114
3284
  "character": 14
3115
3285
  },
3116
3286
  "type": {
3117
3287
  "__schema": "TypeRefSchema",
3118
3288
  "location": {
3119
3289
  "filePath": "merge-lanes.main.runtime.ts",
3120
- "line": 536,
3290
+ "line": 546,
3121
3291
  "character": 14
3122
3292
  },
3123
3293
  "name": "ComponentID",
@@ -3135,7 +3305,7 @@
3135
3305
  "__schema": "ParameterSchema",
3136
3306
  "location": {
3137
3307
  "filePath": "merge-lanes.main.runtime.ts",
3138
- "line": 537,
3308
+ "line": 547,
3139
3309
  "character": 3
3140
3310
  },
3141
3311
  "name": "legacyScope",
@@ -3143,7 +3313,7 @@
3143
3313
  "__schema": "TypeRefSchema",
3144
3314
  "location": {
3145
3315
  "filePath": "merge-lanes.main.runtime.ts",
3146
- "line": 537,
3316
+ "line": 547,
3147
3317
  "character": 16
3148
3318
  },
3149
3319
  "name": "LegacyScope"
@@ -3155,7 +3325,7 @@
3155
3325
  "__schema": "ParameterSchema",
3156
3326
  "location": {
3157
3327
  "filePath": "merge-lanes.main.runtime.ts",
3158
- "line": 538,
3328
+ "line": 548,
3159
3329
  "character": 3
3160
3330
  },
3161
3331
  "name": "includeDeps",
@@ -3163,7 +3333,7 @@
3163
3333
  "__schema": "InferenceTypeSchema",
3164
3334
  "location": {
3165
3335
  "filePath": "merge-lanes.main.runtime.ts",
3166
- "line": 538,
3336
+ "line": 548,
3167
3337
  "character": 3
3168
3338
  },
3169
3339
  "type": "boolean"
@@ -3176,7 +3346,7 @@
3176
3346
  "__schema": "ParameterSchema",
3177
3347
  "location": {
3178
3348
  "filePath": "merge-lanes.main.runtime.ts",
3179
- "line": 539,
3349
+ "line": 549,
3180
3350
  "character": 3
3181
3351
  },
3182
3352
  "name": "otherLane",
@@ -3184,7 +3354,7 @@
3184
3354
  "__schema": "TypeRefSchema",
3185
3355
  "location": {
3186
3356
  "filePath": "merge-lanes.main.runtime.ts",
3187
- "line": 539,
3357
+ "line": 549,
3188
3358
  "character": 15
3189
3359
  },
3190
3360
  "name": "Lane",
@@ -3197,7 +3367,7 @@
3197
3367
  "__schema": "ParameterSchema",
3198
3368
  "location": {
3199
3369
  "filePath": "merge-lanes.main.runtime.ts",
3200
- "line": 540,
3370
+ "line": 550,
3201
3371
  "character": 3
3202
3372
  },
3203
3373
  "name": "shouldSquash",
@@ -3205,7 +3375,7 @@
3205
3375
  "__schema": "KeywordTypeSchema",
3206
3376
  "location": {
3207
3377
  "filePath": "merge-lanes.main.runtime.ts",
3208
- "line": 540,
3378
+ "line": 550,
3209
3379
  "character": 18
3210
3380
  },
3211
3381
  "name": "boolean"
@@ -3218,7 +3388,7 @@
3218
3388
  "__schema": "TypeRefSchema",
3219
3389
  "location": {
3220
3390
  "filePath": "merge-lanes.main.runtime.ts",
3221
- "line": 541,
3391
+ "line": 551,
3222
3392
  "character": 4
3223
3393
  },
3224
3394
  "name": "Promise",
@@ -3227,14 +3397,14 @@
3227
3397
  "__schema": "TypeArraySchema",
3228
3398
  "location": {
3229
3399
  "filePath": "merge-lanes.main.runtime.ts",
3230
- "line": 541,
3400
+ "line": 551,
3231
3401
  "character": 12
3232
3402
  },
3233
3403
  "type": {
3234
3404
  "__schema": "TypeRefSchema",
3235
3405
  "location": {
3236
3406
  "filePath": "merge-lanes.main.runtime.ts",
3237
- "line": 541,
3407
+ "line": 551,
3238
3408
  "character": 12
3239
3409
  },
3240
3410
  "name": "ComponentMergeStatus",
@@ -3254,7 +3424,7 @@
3254
3424
  "__schema": "FunctionLikeSchema",
3255
3425
  "location": {
3256
3426
  "filePath": "merge-lanes.main.runtime.ts",
3257
- "line": 650,
3427
+ "line": 660,
3258
3428
  "character": 1
3259
3429
  },
3260
3430
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -3264,7 +3434,7 @@
3264
3434
  "__schema": "ParameterSchema",
3265
3435
  "location": {
3266
3436
  "filePath": "merge-lanes.main.runtime.ts",
3267
- "line": 650,
3437
+ "line": 660,
3268
3438
  "character": 32
3269
3439
  },
3270
3440
  "name": "otherLaneId",
@@ -3272,7 +3442,7 @@
3272
3442
  "__schema": "TypeRefSchema",
3273
3443
  "location": {
3274
3444
  "filePath": "merge-lanes.main.runtime.ts",
3275
- "line": 650,
3445
+ "line": 660,
3276
3446
  "character": 45
3277
3447
  },
3278
3448
  "name": "LaneId",
@@ -3290,7 +3460,7 @@
3290
3460
  "__schema": "InferenceTypeSchema",
3291
3461
  "location": {
3292
3462
  "filePath": "merge-lanes.main.runtime.ts",
3293
- "line": 650,
3463
+ "line": 660,
3294
3464
  "character": 1
3295
3465
  },
3296
3466
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -3303,7 +3473,7 @@
3303
3473
  "__schema": "FunctionLikeSchema",
3304
3474
  "location": {
3305
3475
  "filePath": "merge-lanes.main.runtime.ts",
3306
- "line": 659,
3476
+ "line": 669,
3307
3477
  "character": 1
3308
3478
  },
3309
3479
  "signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
@@ -3313,7 +3483,7 @@
3313
3483
  "__schema": "ParameterSchema",
3314
3484
  "location": {
3315
3485
  "filePath": "merge-lanes.main.runtime.ts",
3316
- "line": 660,
3486
+ "line": 670,
3317
3487
  "character": 3
3318
3488
  },
3319
3489
  "name": "succeededComponents",
@@ -3321,14 +3491,14 @@
3321
3491
  "__schema": "TypeArraySchema",
3322
3492
  "location": {
3323
3493
  "filePath": "merge-lanes.main.runtime.ts",
3324
- "line": 660,
3494
+ "line": 670,
3325
3495
  "character": 24
3326
3496
  },
3327
3497
  "type": {
3328
3498
  "__schema": "TypeRefSchema",
3329
3499
  "location": {
3330
3500
  "filePath": "merge-lanes.main.runtime.ts",
3331
- "line": 660,
3501
+ "line": 670,
3332
3502
  "character": 24
3333
3503
  },
3334
3504
  "name": "ComponentMergeStatus",
@@ -3345,7 +3515,7 @@
3345
3515
  "__schema": "ParameterSchema",
3346
3516
  "location": {
3347
3517
  "filePath": "merge-lanes.main.runtime.ts",
3348
- "line": 661,
3518
+ "line": 671,
3349
3519
  "character": 3
3350
3520
  },
3351
3521
  "name": "currentLaneId",
@@ -3353,7 +3523,7 @@
3353
3523
  "__schema": "TypeRefSchema",
3354
3524
  "location": {
3355
3525
  "filePath": "merge-lanes.main.runtime.ts",
3356
- "line": 661,
3526
+ "line": 671,
3357
3527
  "character": 18
3358
3528
  },
3359
3529
  "name": "LaneId",
@@ -3370,7 +3540,7 @@
3370
3540
  "__schema": "ParameterSchema",
3371
3541
  "location": {
3372
3542
  "filePath": "merge-lanes.main.runtime.ts",
3373
- "line": 662,
3543
+ "line": 672,
3374
3544
  "character": 3
3375
3545
  },
3376
3546
  "name": "otherLaneId",
@@ -3378,7 +3548,7 @@
3378
3548
  "__schema": "TypeRefSchema",
3379
3549
  "location": {
3380
3550
  "filePath": "merge-lanes.main.runtime.ts",
3381
- "line": 662,
3551
+ "line": 672,
3382
3552
  "character": 16
3383
3553
  },
3384
3554
  "name": "LaneId",
@@ -3395,7 +3565,7 @@
3395
3565
  "__schema": "ParameterSchema",
3396
3566
  "location": {
3397
3567
  "filePath": "merge-lanes.main.runtime.ts",
3398
- "line": 663,
3568
+ "line": 673,
3399
3569
  "character": 3
3400
3570
  },
3401
3571
  "name": "scope",
@@ -3403,7 +3573,7 @@
3403
3573
  "__schema": "TypeRefSchema",
3404
3574
  "location": {
3405
3575
  "filePath": "merge-lanes.main.runtime.ts",
3406
- "line": 663,
3576
+ "line": 673,
3407
3577
  "character": 10
3408
3578
  },
3409
3579
  "name": "LegacyScope"
@@ -3415,7 +3585,7 @@
3415
3585
  "__schema": "ParameterSchema",
3416
3586
  "location": {
3417
3587
  "filePath": "merge-lanes.main.runtime.ts",
3418
- "line": 664,
3588
+ "line": 674,
3419
3589
  "character": 3
3420
3590
  },
3421
3591
  "name": "messageTitle",
@@ -3423,7 +3593,7 @@
3423
3593
  "__schema": "KeywordTypeSchema",
3424
3594
  "location": {
3425
3595
  "filePath": "merge-lanes.main.runtime.ts",
3426
- "line": 664,
3596
+ "line": 674,
3427
3597
  "character": 18
3428
3598
  },
3429
3599
  "name": "string"
@@ -3436,7 +3606,7 @@
3436
3606
  "__schema": "InferenceTypeSchema",
3437
3607
  "location": {
3438
3608
  "filePath": "merge-lanes.main.runtime.ts",
3439
- "line": 659,
3609
+ "line": 669,
3440
3610
  "character": 1
3441
3611
  },
3442
3612
  "type": "Promise<void>"
@@ -3449,14 +3619,14 @@
3449
3619
  "__schema": "FunctionLikeSchema",
3450
3620
  "location": {
3451
3621
  "filePath": "merge-lanes.main.runtime.ts",
3452
- "line": 698,
3622
+ "line": 708,
3453
3623
  "character": 1
3454
3624
  },
3455
3625
  "doc": {
3456
3626
  "__schema": "DocSchema",
3457
3627
  "location": {
3458
3628
  "filePath": "merge-lanes.main.runtime.ts",
3459
- "line": 695,
3629
+ "line": 705,
3460
3630
  "character": 1
3461
3631
  },
3462
3632
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3469,7 +3639,7 @@
3469
3639
  "__schema": "ParameterSchema",
3470
3640
  "location": {
3471
3641
  "filePath": "merge-lanes.main.runtime.ts",
3472
- "line": 699,
3642
+ "line": 709,
3473
3643
  "character": 3
3474
3644
  },
3475
3645
  "name": "currentLaneName",
@@ -3477,7 +3647,7 @@
3477
3647
  "__schema": "KeywordTypeSchema",
3478
3648
  "location": {
3479
3649
  "filePath": "merge-lanes.main.runtime.ts",
3480
- "line": 699,
3650
+ "line": 709,
3481
3651
  "character": 20
3482
3652
  },
3483
3653
  "name": "string"
@@ -3489,7 +3659,7 @@
3489
3659
  "__schema": "ParameterSchema",
3490
3660
  "location": {
3491
3661
  "filePath": "merge-lanes.main.runtime.ts",
3492
- "line": 700,
3662
+ "line": 710,
3493
3663
  "character": 3
3494
3664
  },
3495
3665
  "name": "otherLaneId",
@@ -3497,7 +3667,7 @@
3497
3667
  "__schema": "TypeRefSchema",
3498
3668
  "location": {
3499
3669
  "filePath": "merge-lanes.main.runtime.ts",
3500
- "line": 700,
3670
+ "line": 710,
3501
3671
  "character": 16
3502
3672
  },
3503
3673
  "name": "LaneId",
@@ -3514,7 +3684,7 @@
3514
3684
  "__schema": "ParameterSchema",
3515
3685
  "location": {
3516
3686
  "filePath": "merge-lanes.main.runtime.ts",
3517
- "line": 701,
3687
+ "line": 711,
3518
3688
  "character": 3
3519
3689
  },
3520
3690
  "name": "id",
@@ -3522,7 +3692,7 @@
3522
3692
  "__schema": "TypeRefSchema",
3523
3693
  "location": {
3524
3694
  "filePath": "merge-lanes.main.runtime.ts",
3525
- "line": 701,
3695
+ "line": 711,
3526
3696
  "character": 7
3527
3697
  },
3528
3698
  "name": "ComponentID",
@@ -3539,7 +3709,7 @@
3539
3709
  "__schema": "ParameterSchema",
3540
3710
  "location": {
3541
3711
  "filePath": "merge-lanes.main.runtime.ts",
3542
- "line": 702,
3712
+ "line": 712,
3543
3713
  "character": 3
3544
3714
  },
3545
3715
  "name": "divergeData",
@@ -3547,7 +3717,7 @@
3547
3717
  "__schema": "TypeRefSchema",
3548
3718
  "location": {
3549
3719
  "filePath": "merge-lanes.main.runtime.ts",
3550
- "line": 702,
3720
+ "line": 712,
3551
3721
  "character": 16
3552
3722
  },
3553
3723
  "name": "SnapsDistance",
@@ -3560,7 +3730,7 @@
3560
3730
  "__schema": "ParameterSchema",
3561
3731
  "location": {
3562
3732
  "filePath": "merge-lanes.main.runtime.ts",
3563
- "line": 703,
3733
+ "line": 713,
3564
3734
  "character": 3
3565
3735
  },
3566
3736
  "name": "log",
@@ -3568,7 +3738,7 @@
3568
3738
  "__schema": "TypeRefSchema",
3569
3739
  "location": {
3570
3740
  "filePath": "merge-lanes.main.runtime.ts",
3571
- "line": 703,
3741
+ "line": 713,
3572
3742
  "character": 8
3573
3743
  },
3574
3744
  "name": "Log",
@@ -3581,7 +3751,7 @@
3581
3751
  "__schema": "ParameterSchema",
3582
3752
  "location": {
3583
3753
  "filePath": "merge-lanes.main.runtime.ts",
3584
- "line": 704,
3754
+ "line": 714,
3585
3755
  "character": 3
3586
3756
  },
3587
3757
  "name": "scope",
@@ -3589,7 +3759,7 @@
3589
3759
  "__schema": "TypeRefSchema",
3590
3760
  "location": {
3591
3761
  "filePath": "merge-lanes.main.runtime.ts",
3592
- "line": 704,
3762
+ "line": 714,
3593
3763
  "character": 10
3594
3764
  },
3595
3765
  "name": "LegacyScope"
@@ -3601,7 +3771,7 @@
3601
3771
  "__schema": "ParameterSchema",
3602
3772
  "location": {
3603
3773
  "filePath": "merge-lanes.main.runtime.ts",
3604
- "line": 705,
3774
+ "line": 715,
3605
3775
  "character": 3
3606
3776
  },
3607
3777
  "name": "componentFromModel",
@@ -3609,7 +3779,7 @@
3609
3779
  "__schema": "TypeRefSchema",
3610
3780
  "location": {
3611
3781
  "filePath": "merge-lanes.main.runtime.ts",
3612
- "line": 705,
3782
+ "line": 715,
3613
3783
  "character": 24
3614
3784
  },
3615
3785
  "name": "Version",
@@ -3622,7 +3792,7 @@
3622
3792
  "__schema": "ParameterSchema",
3623
3793
  "location": {
3624
3794
  "filePath": "merge-lanes.main.runtime.ts",
3625
- "line": 706,
3795
+ "line": 716,
3626
3796
  "character": 3
3627
3797
  },
3628
3798
  "name": "messageTitle",
@@ -3630,7 +3800,7 @@
3630
3800
  "__schema": "KeywordTypeSchema",
3631
3801
  "location": {
3632
3802
  "filePath": "merge-lanes.main.runtime.ts",
3633
- "line": 706,
3803
+ "line": 716,
3634
3804
  "character": 18
3635
3805
  },
3636
3806
  "name": "string"
@@ -3643,7 +3813,7 @@
3643
3813
  "__schema": "TypeRefSchema",
3644
3814
  "location": {
3645
3815
  "filePath": "merge-lanes.main.runtime.ts",
3646
- "line": 707,
3816
+ "line": 717,
3647
3817
  "character": 4
3648
3818
  },
3649
3819
  "name": "Promise",
@@ -3652,7 +3822,7 @@
3652
3822
  "__schema": "TypeUnionSchema",
3653
3823
  "location": {
3654
3824
  "filePath": "merge-lanes.main.runtime.ts",
3655
- "line": 707,
3825
+ "line": 717,
3656
3826
  "character": 12
3657
3827
  },
3658
3828
  "types": [
@@ -3660,7 +3830,7 @@
3660
3830
  "__schema": "TypeRefSchema",
3661
3831
  "location": {
3662
3832
  "filePath": "merge-lanes.main.runtime.ts",
3663
- "line": 707,
3833
+ "line": 717,
3664
3834
  "character": 12
3665
3835
  },
3666
3836
  "name": "Version",
@@ -3670,7 +3840,7 @@
3670
3840
  "__schema": "KeywordTypeSchema",
3671
3841
  "location": {
3672
3842
  "filePath": "merge-lanes.main.runtime.ts",
3673
- "line": 707,
3843
+ "line": 717,
3674
3844
  "character": 22
3675
3845
  },
3676
3846
  "name": "undefined"
@@ -3687,7 +3857,7 @@
3687
3857
  "__schema": "UnImplementedSchema",
3688
3858
  "location": {
3689
3859
  "filePath": "merge-lanes.main.runtime.ts",
3690
- "line": 780,
3860
+ "line": 790,
3691
3861
  "character": 1
3692
3862
  },
3693
3863
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3736,7 +3906,7 @@
3736
3906
  "componentId": {
3737
3907
  "scope": "teambit.lanes",
3738
3908
  "name": "merge-lanes",
3739
- "version": "1.0.254"
3909
+ "version": "1.0.255"
3740
3910
  },
3741
3911
  "taggedModuleExports": []
3742
3912
  }