@teambit/merge-lanes 1.0.224 → 1.0.226

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +227 -187
  3. package/dist/merge-lane-from-scope.cmd.js +1 -0
  4. package/dist/merge-lane-from-scope.cmd.js.map +1 -1
  5. package/dist/merge-lanes.main.runtime.d.ts +1 -0
  6. package/dist/merge-lanes.main.runtime.js +55 -117
  7. package/dist/merge-lanes.main.runtime.js.map +1 -1
  8. package/package.json +11 -11
  9. /package/dist/{preview-1712501762220.js → preview-1712632644937.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -532,7 +532,7 @@
532
532
  "__schema": "FunctionLikeSchema",
533
533
  "location": {
534
534
  "filePath": "merge-lanes.main.runtime.ts",
535
- "line": 278,
535
+ "line": 281,
536
536
  "character": 3
537
537
  },
538
538
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -542,7 +542,7 @@
542
542
  "__schema": "ParameterSchema",
543
543
  "location": {
544
544
  "filePath": "merge-lanes.main.runtime.ts",
545
- "line": 278,
545
+ "line": 281,
546
546
  "character": 24
547
547
  },
548
548
  "name": "checkoutProps",
@@ -550,7 +550,7 @@
550
550
  "__schema": "TypeRefSchema",
551
551
  "location": {
552
552
  "filePath": "merge-lanes.main.runtime.ts",
553
- "line": 278,
553
+ "line": 281,
554
554
  "character": 39
555
555
  },
556
556
  "name": "CheckoutProps",
@@ -566,7 +566,7 @@
566
566
  "__schema": "ParameterSchema",
567
567
  "location": {
568
568
  "filePath": "merge-lanes.main.runtime.ts",
569
- "line": 278,
569
+ "line": 281,
570
570
  "character": 54
571
571
  },
572
572
  "name": "mergeAbortOpts",
@@ -574,7 +574,7 @@
574
574
  "__schema": "TypeRefSchema",
575
575
  "location": {
576
576
  "filePath": "merge-lanes.main.runtime.ts",
577
- "line": 278,
577
+ "line": 281,
578
578
  "character": 70
579
579
  },
580
580
  "name": "MergeAbortOpts",
@@ -588,7 +588,7 @@
588
588
  "__schema": "InferenceTypeSchema",
589
589
  "location": {
590
590
  "filePath": "merge-lanes.main.runtime.ts",
591
- "line": 278,
591
+ "line": 281,
592
592
  "character": 3
593
593
  },
594
594
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -601,7 +601,7 @@
601
601
  "__schema": "FunctionLikeSchema",
602
602
  "location": {
603
603
  "filePath": "merge-lanes.main.runtime.ts",
604
- "line": 334,
604
+ "line": 337,
605
605
  "character": 3
606
606
  },
607
607
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -611,7 +611,7 @@
611
611
  "__schema": "ParameterSchema",
612
612
  "location": {
613
613
  "filePath": "merge-lanes.main.runtime.ts",
614
- "line": 335,
614
+ "line": 338,
615
615
  "character": 5
616
616
  },
617
617
  "name": "fromLane",
@@ -619,7 +619,7 @@
619
619
  "__schema": "KeywordTypeSchema",
620
620
  "location": {
621
621
  "filePath": "merge-lanes.main.runtime.ts",
622
- "line": 335,
622
+ "line": 338,
623
623
  "character": 15
624
624
  },
625
625
  "name": "string"
@@ -631,7 +631,7 @@
631
631
  "__schema": "ParameterSchema",
632
632
  "location": {
633
633
  "filePath": "merge-lanes.main.runtime.ts",
634
- "line": 336,
634
+ "line": 339,
635
635
  "character": 5
636
636
  },
637
637
  "name": "toLane",
@@ -639,7 +639,7 @@
639
639
  "__schema": "KeywordTypeSchema",
640
640
  "location": {
641
641
  "filePath": "merge-lanes.main.runtime.ts",
642
- "line": 336,
642
+ "line": 339,
643
643
  "character": 13
644
644
  },
645
645
  "name": "string"
@@ -651,7 +651,7 @@
651
651
  "__schema": "ParameterSchema",
652
652
  "location": {
653
653
  "filePath": "merge-lanes.main.runtime.ts",
654
- "line": 337,
654
+ "line": 340,
655
655
  "character": 5
656
656
  },
657
657
  "name": "options",
@@ -659,7 +659,7 @@
659
659
  "__schema": "TypeIntersectionSchema",
660
660
  "location": {
661
661
  "filePath": "merge-lanes.main.runtime.ts",
662
- "line": 337,
662
+ "line": 340,
663
663
  "character": 14
664
664
  },
665
665
  "types": [
@@ -667,7 +667,7 @@
667
667
  "__schema": "TypeRefSchema",
668
668
  "location": {
669
669
  "filePath": "merge-lanes.main.runtime.ts",
670
- "line": 337,
670
+ "line": 340,
671
671
  "character": 14
672
672
  },
673
673
  "name": "Partial",
@@ -676,7 +676,7 @@
676
676
  "__schema": "TypeRefSchema",
677
677
  "location": {
678
678
  "filePath": "merge-lanes.main.runtime.ts",
679
- "line": 337,
679
+ "line": 340,
680
680
  "character": 22
681
681
  },
682
682
  "name": "MergeLaneOptions",
@@ -688,7 +688,7 @@
688
688
  "__schema": "TypeLiteralSchema",
689
689
  "location": {
690
690
  "filePath": "merge-lanes.main.runtime.ts",
691
- "line": 337,
691
+ "line": 340,
692
692
  "character": 42
693
693
  },
694
694
  "members": [
@@ -696,7 +696,7 @@
696
696
  "__schema": "VariableLikeSchema",
697
697
  "location": {
698
698
  "filePath": "merge-lanes.main.runtime.ts",
699
- "line": 337,
699
+ "line": 340,
700
700
  "character": 44
701
701
  },
702
702
  "signature": "(property) push?: boolean | undefined",
@@ -705,7 +705,7 @@
705
705
  "__schema": "KeywordTypeSchema",
706
706
  "location": {
707
707
  "filePath": "merge-lanes.main.runtime.ts",
708
- "line": 337,
708
+ "line": 340,
709
709
  "character": 51
710
710
  },
711
711
  "name": "boolean"
@@ -716,7 +716,7 @@
716
716
  "__schema": "VariableLikeSchema",
717
717
  "location": {
718
718
  "filePath": "merge-lanes.main.runtime.ts",
719
- "line": 337,
719
+ "line": 340,
720
720
  "character": 60
721
721
  },
722
722
  "signature": "(property) reMerge?: boolean | undefined",
@@ -725,7 +725,7 @@
725
725
  "__schema": "KeywordTypeSchema",
726
726
  "location": {
727
727
  "filePath": "merge-lanes.main.runtime.ts",
728
- "line": 337,
728
+ "line": 340,
729
729
  "character": 70
730
730
  },
731
731
  "name": "boolean"
@@ -744,7 +744,7 @@
744
744
  "__schema": "TypeRefSchema",
745
745
  "location": {
746
746
  "filePath": "merge-lanes.main.runtime.ts",
747
- "line": 338,
747
+ "line": 341,
748
748
  "character": 6
749
749
  },
750
750
  "name": "Promise",
@@ -753,7 +753,7 @@
753
753
  "__schema": "TypeRefSchema",
754
754
  "location": {
755
755
  "filePath": "merge-lanes.main.runtime.ts",
756
- "line": 338,
756
+ "line": 341,
757
757
  "character": 14
758
758
  },
759
759
  "name": "MergeFromScopeResult",
@@ -769,7 +769,7 @@
769
769
  "__schema": "VariableLikeSchema",
770
770
  "location": {
771
771
  "filePath": "merge-lanes.main.runtime.ts",
772
- "line": 540,
772
+ "line": 482,
773
773
  "character": 3
774
774
  },
775
775
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -778,7 +778,7 @@
778
778
  "__schema": "InferenceTypeSchema",
779
779
  "location": {
780
780
  "filePath": "merge-lanes.main.runtime.ts",
781
- "line": 540,
781
+ "line": 482,
782
782
  "character": 3
783
783
  },
784
784
  "type": "never[]"
@@ -790,7 +790,7 @@
790
790
  "__schema": "VariableLikeSchema",
791
791
  "location": {
792
792
  "filePath": "merge-lanes.main.runtime.ts",
793
- "line": 541,
793
+ "line": 483,
794
794
  "character": 3
795
795
  },
796
796
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -799,7 +799,7 @@
799
799
  "__schema": "InferenceTypeSchema",
800
800
  "location": {
801
801
  "filePath": "merge-lanes.main.runtime.ts",
802
- "line": 541,
802
+ "line": 483,
803
803
  "character": 3
804
804
  },
805
805
  "type": "Aspect[]"
@@ -811,7 +811,7 @@
811
811
  "__schema": "VariableLikeSchema",
812
812
  "location": {
813
813
  "filePath": "merge-lanes.main.runtime.ts",
814
- "line": 554,
814
+ "line": 496,
815
815
  "character": 3
816
816
  },
817
817
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -820,7 +820,7 @@
820
820
  "__schema": "InferenceTypeSchema",
821
821
  "location": {
822
822
  "filePath": "merge-lanes.main.runtime.ts",
823
- "line": 554,
823
+ "line": 496,
824
824
  "character": 3
825
825
  },
826
826
  "type": "RuntimeDefinition"
@@ -832,7 +832,7 @@
832
832
  "__schema": "FunctionLikeSchema",
833
833
  "location": {
834
834
  "filePath": "merge-lanes.main.runtime.ts",
835
- "line": 556,
835
+ "line": 498,
836
836
  "character": 3
837
837
  },
838
838
  "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>",
@@ -842,7 +842,7 @@
842
842
  "__schema": "ParameterSchema",
843
843
  "location": {
844
844
  "filePath": "merge-lanes.main.runtime.ts",
845
- "line": 556,
845
+ "line": 498,
846
846
  "character": 25
847
847
  },
848
848
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -850,7 +850,7 @@
850
850
  "__schema": "TupleTypeSchema",
851
851
  "location": {
852
852
  "filePath": "merge-lanes.main.runtime.ts",
853
- "line": 568,
853
+ "line": 510,
854
854
  "character": 6
855
855
  },
856
856
  "elements": [
@@ -858,7 +858,7 @@
858
858
  "__schema": "TypeRefSchema",
859
859
  "location": {
860
860
  "filePath": "merge-lanes.main.runtime.ts",
861
- "line": 569,
861
+ "line": 511,
862
862
  "character": 5
863
863
  },
864
864
  "name": "LanesMain",
@@ -871,7 +871,7 @@
871
871
  "__schema": "TypeRefSchema",
872
872
  "location": {
873
873
  "filePath": "merge-lanes.main.runtime.ts",
874
- "line": 570,
874
+ "line": 512,
875
875
  "character": 5
876
876
  },
877
877
  "name": "CLIMain",
@@ -884,7 +884,7 @@
884
884
  "__schema": "TypeRefSchema",
885
885
  "location": {
886
886
  "filePath": "merge-lanes.main.runtime.ts",
887
- "line": 571,
887
+ "line": 513,
888
888
  "character": 5
889
889
  },
890
890
  "name": "Workspace",
@@ -897,7 +897,7 @@
897
897
  "__schema": "TypeRefSchema",
898
898
  "location": {
899
899
  "filePath": "merge-lanes.main.runtime.ts",
900
- "line": 572,
900
+ "line": 514,
901
901
  "character": 5
902
902
  },
903
903
  "name": "MergingMain",
@@ -910,7 +910,7 @@
910
910
  "__schema": "TypeRefSchema",
911
911
  "location": {
912
912
  "filePath": "merge-lanes.main.runtime.ts",
913
- "line": 573,
913
+ "line": 515,
914
914
  "character": 5
915
915
  },
916
916
  "name": "LoggerMain",
@@ -923,7 +923,7 @@
923
923
  "__schema": "TypeRefSchema",
924
924
  "location": {
925
925
  "filePath": "merge-lanes.main.runtime.ts",
926
- "line": 574,
926
+ "line": 516,
927
927
  "character": 5
928
928
  },
929
929
  "name": "RemoveMain",
@@ -936,7 +936,7 @@
936
936
  "__schema": "TypeRefSchema",
937
937
  "location": {
938
938
  "filePath": "merge-lanes.main.runtime.ts",
939
- "line": 575,
939
+ "line": 517,
940
940
  "character": 5
941
941
  },
942
942
  "name": "ScopeMain",
@@ -949,7 +949,7 @@
949
949
  "__schema": "TypeRefSchema",
950
950
  "location": {
951
951
  "filePath": "merge-lanes.main.runtime.ts",
952
- "line": 576,
952
+ "line": 518,
953
953
  "character": 5
954
954
  },
955
955
  "name": "ExportMain",
@@ -962,7 +962,7 @@
962
962
  "__schema": "TypeRefSchema",
963
963
  "location": {
964
964
  "filePath": "merge-lanes.main.runtime.ts",
965
- "line": 577,
965
+ "line": 519,
966
966
  "character": 5
967
967
  },
968
968
  "name": "ImporterMain",
@@ -975,7 +975,7 @@
975
975
  "__schema": "TypeRefSchema",
976
976
  "location": {
977
977
  "filePath": "merge-lanes.main.runtime.ts",
978
- "line": 578,
978
+ "line": 520,
979
979
  "character": 5
980
980
  },
981
981
  "name": "CheckoutMain",
@@ -988,7 +988,7 @@
988
988
  "__schema": "TypeRefSchema",
989
989
  "location": {
990
990
  "filePath": "merge-lanes.main.runtime.ts",
991
- "line": 579,
991
+ "line": 521,
992
992
  "character": 5
993
993
  },
994
994
  "name": "GlobalConfigMain",
@@ -1007,7 +1007,7 @@
1007
1007
  "__schema": "InferenceTypeSchema",
1008
1008
  "location": {
1009
1009
  "filePath": "merge-lanes.main.runtime.ts",
1010
- "line": 556,
1010
+ "line": 498,
1011
1011
  "character": 3
1012
1012
  },
1013
1013
  "type": "Promise<MergeLanesMain>"
@@ -1073,16 +1073,16 @@
1073
1073
  "__schema": "TypeSchema",
1074
1074
  "location": {
1075
1075
  "filePath": "merge-lanes.main.runtime.ts",
1076
- "line": 40,
1076
+ "line": 39,
1077
1077
  "character": 1
1078
1078
  },
1079
- "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 ... 7 more ...;\n excludeNonLaneComps?: boolean | undefined;\n}",
1079
+ "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 ... 8 more ...;\n shouldIncludeUpdateDependents?: boolean | undefined;\n}",
1080
1080
  "name": "MergeLaneOptions",
1081
1081
  "type": {
1082
1082
  "__schema": "TypeLiteralSchema",
1083
1083
  "location": {
1084
1084
  "filePath": "merge-lanes.main.runtime.ts",
1085
- "line": 40,
1085
+ "line": 39,
1086
1086
  "character": 32
1087
1087
  },
1088
1088
  "members": [
@@ -1090,7 +1090,7 @@
1090
1090
  "__schema": "VariableLikeSchema",
1091
1091
  "location": {
1092
1092
  "filePath": "merge-lanes.main.runtime.ts",
1093
- "line": 41,
1093
+ "line": 40,
1094
1094
  "character": 3
1095
1095
  },
1096
1096
  "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -1099,7 +1099,7 @@
1099
1099
  "__schema": "TypeRefSchema",
1100
1100
  "location": {
1101
1101
  "filePath": "merge-lanes.main.runtime.ts",
1102
- "line": 41,
1102
+ "line": 40,
1103
1103
  "character": 18
1104
1104
  },
1105
1105
  "name": "MergeStrategy",
@@ -1111,7 +1111,7 @@
1111
1111
  "__schema": "VariableLikeSchema",
1112
1112
  "location": {
1113
1113
  "filePath": "merge-lanes.main.runtime.ts",
1114
- "line": 42,
1114
+ "line": 41,
1115
1115
  "character": 3
1116
1116
  },
1117
1117
  "signature": "(property) ours?: boolean | undefined",
@@ -1120,7 +1120,7 @@
1120
1120
  "__schema": "KeywordTypeSchema",
1121
1121
  "location": {
1122
1122
  "filePath": "merge-lanes.main.runtime.ts",
1123
- "line": 42,
1123
+ "line": 41,
1124
1124
  "character": 10
1125
1125
  },
1126
1126
  "name": "boolean"
@@ -1131,7 +1131,7 @@
1131
1131
  "__schema": "VariableLikeSchema",
1132
1132
  "location": {
1133
1133
  "filePath": "merge-lanes.main.runtime.ts",
1134
- "line": 43,
1134
+ "line": 42,
1135
1135
  "character": 3
1136
1136
  },
1137
1137
  "signature": "(property) theirs?: boolean | undefined",
@@ -1140,7 +1140,7 @@
1140
1140
  "__schema": "KeywordTypeSchema",
1141
1141
  "location": {
1142
1142
  "filePath": "merge-lanes.main.runtime.ts",
1143
- "line": 43,
1143
+ "line": 42,
1144
1144
  "character": 12
1145
1145
  },
1146
1146
  "name": "boolean"
@@ -1151,7 +1151,7 @@
1151
1151
  "__schema": "VariableLikeSchema",
1152
1152
  "location": {
1153
1153
  "filePath": "merge-lanes.main.runtime.ts",
1154
- "line": 44,
1154
+ "line": 43,
1155
1155
  "character": 3
1156
1156
  },
1157
1157
  "signature": "(property) noSnap: boolean",
@@ -1160,7 +1160,7 @@
1160
1160
  "__schema": "KeywordTypeSchema",
1161
1161
  "location": {
1162
1162
  "filePath": "merge-lanes.main.runtime.ts",
1163
- "line": 44,
1163
+ "line": 43,
1164
1164
  "character": 11
1165
1165
  },
1166
1166
  "name": "boolean"
@@ -1171,7 +1171,7 @@
1171
1171
  "__schema": "VariableLikeSchema",
1172
1172
  "location": {
1173
1173
  "filePath": "merge-lanes.main.runtime.ts",
1174
- "line": 45,
1174
+ "line": 44,
1175
1175
  "character": 3
1176
1176
  },
1177
1177
  "signature": "(property) snapMessage: string",
@@ -1180,7 +1180,7 @@
1180
1180
  "__schema": "KeywordTypeSchema",
1181
1181
  "location": {
1182
1182
  "filePath": "merge-lanes.main.runtime.ts",
1183
- "line": 45,
1183
+ "line": 44,
1184
1184
  "character": 16
1185
1185
  },
1186
1186
  "name": "string"
@@ -1191,7 +1191,7 @@
1191
1191
  "__schema": "VariableLikeSchema",
1192
1192
  "location": {
1193
1193
  "filePath": "merge-lanes.main.runtime.ts",
1194
- "line": 46,
1194
+ "line": 45,
1195
1195
  "character": 3
1196
1196
  },
1197
1197
  "signature": "(property) existingOnWorkspaceOnly: boolean",
@@ -1200,7 +1200,7 @@
1200
1200
  "__schema": "KeywordTypeSchema",
1201
1201
  "location": {
1202
1202
  "filePath": "merge-lanes.main.runtime.ts",
1203
- "line": 46,
1203
+ "line": 45,
1204
1204
  "character": 28
1205
1205
  },
1206
1206
  "name": "boolean"
@@ -1211,7 +1211,7 @@
1211
1211
  "__schema": "VariableLikeSchema",
1212
1212
  "location": {
1213
1213
  "filePath": "merge-lanes.main.runtime.ts",
1214
- "line": 47,
1214
+ "line": 46,
1215
1215
  "character": 3
1216
1216
  },
1217
1217
  "signature": "(property) build: boolean",
@@ -1220,7 +1220,7 @@
1220
1220
  "__schema": "KeywordTypeSchema",
1221
1221
  "location": {
1222
1222
  "filePath": "merge-lanes.main.runtime.ts",
1223
- "line": 47,
1223
+ "line": 46,
1224
1224
  "character": 10
1225
1225
  },
1226
1226
  "name": "boolean"
@@ -1231,7 +1231,7 @@
1231
1231
  "__schema": "VariableLikeSchema",
1232
1232
  "location": {
1233
1233
  "filePath": "merge-lanes.main.runtime.ts",
1234
- "line": 48,
1234
+ "line": 47,
1235
1235
  "character": 3
1236
1236
  },
1237
1237
  "signature": "(property) keepReadme: boolean",
@@ -1240,7 +1240,7 @@
1240
1240
  "__schema": "KeywordTypeSchema",
1241
1241
  "location": {
1242
1242
  "filePath": "merge-lanes.main.runtime.ts",
1243
- "line": 48,
1243
+ "line": 47,
1244
1244
  "character": 15
1245
1245
  },
1246
1246
  "name": "boolean"
@@ -1251,7 +1251,7 @@
1251
1251
  "__schema": "VariableLikeSchema",
1252
1252
  "location": {
1253
1253
  "filePath": "merge-lanes.main.runtime.ts",
1254
- "line": 49,
1254
+ "line": 48,
1255
1255
  "character": 3
1256
1256
  },
1257
1257
  "signature": "(property) squash?: boolean | undefined",
@@ -1260,7 +1260,7 @@
1260
1260
  "__schema": "KeywordTypeSchema",
1261
1261
  "location": {
1262
1262
  "filePath": "merge-lanes.main.runtime.ts",
1263
- "line": 49,
1263
+ "line": 48,
1264
1264
  "character": 12
1265
1265
  },
1266
1266
  "name": "boolean"
@@ -1271,7 +1271,7 @@
1271
1271
  "__schema": "VariableLikeSchema",
1272
1272
  "location": {
1273
1273
  "filePath": "merge-lanes.main.runtime.ts",
1274
- "line": 50,
1274
+ "line": 49,
1275
1275
  "character": 3
1276
1276
  },
1277
1277
  "signature": "(property) noSquash: boolean",
@@ -1280,7 +1280,7 @@
1280
1280
  "__schema": "KeywordTypeSchema",
1281
1281
  "location": {
1282
1282
  "filePath": "merge-lanes.main.runtime.ts",
1283
- "line": 50,
1283
+ "line": 49,
1284
1284
  "character": 13
1285
1285
  },
1286
1286
  "name": "boolean"
@@ -1291,7 +1291,7 @@
1291
1291
  "__schema": "VariableLikeSchema",
1292
1292
  "location": {
1293
1293
  "filePath": "merge-lanes.main.runtime.ts",
1294
- "line": 51,
1294
+ "line": 50,
1295
1295
  "character": 3
1296
1296
  },
1297
1297
  "signature": "(property) tag?: boolean | undefined",
@@ -1300,7 +1300,7 @@
1300
1300
  "__schema": "KeywordTypeSchema",
1301
1301
  "location": {
1302
1302
  "filePath": "merge-lanes.main.runtime.ts",
1303
- "line": 51,
1303
+ "line": 50,
1304
1304
  "character": 9
1305
1305
  },
1306
1306
  "name": "boolean"
@@ -1311,7 +1311,7 @@
1311
1311
  "__schema": "VariableLikeSchema",
1312
1312
  "location": {
1313
1313
  "filePath": "merge-lanes.main.runtime.ts",
1314
- "line": 52,
1314
+ "line": 51,
1315
1315
  "character": 3
1316
1316
  },
1317
1317
  "signature": "(property) pattern?: string | undefined",
@@ -1320,7 +1320,7 @@
1320
1320
  "__schema": "KeywordTypeSchema",
1321
1321
  "location": {
1322
1322
  "filePath": "merge-lanes.main.runtime.ts",
1323
- "line": 52,
1323
+ "line": 51,
1324
1324
  "character": 13
1325
1325
  },
1326
1326
  "name": "string"
@@ -1331,7 +1331,7 @@
1331
1331
  "__schema": "VariableLikeSchema",
1332
1332
  "location": {
1333
1333
  "filePath": "merge-lanes.main.runtime.ts",
1334
- "line": 53,
1334
+ "line": 52,
1335
1335
  "character": 3
1336
1336
  },
1337
1337
  "signature": "(property) includeDeps?: boolean | undefined",
@@ -1340,7 +1340,7 @@
1340
1340
  "__schema": "KeywordTypeSchema",
1341
1341
  "location": {
1342
1342
  "filePath": "merge-lanes.main.runtime.ts",
1343
- "line": 53,
1343
+ "line": 52,
1344
1344
  "character": 17
1345
1345
  },
1346
1346
  "name": "boolean"
@@ -1351,7 +1351,7 @@
1351
1351
  "__schema": "VariableLikeSchema",
1352
1352
  "location": {
1353
1353
  "filePath": "merge-lanes.main.runtime.ts",
1354
- "line": 54,
1354
+ "line": 53,
1355
1355
  "character": 3
1356
1356
  },
1357
1357
  "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1360,7 +1360,7 @@
1360
1360
  "__schema": "KeywordTypeSchema",
1361
1361
  "location": {
1362
1362
  "filePath": "merge-lanes.main.runtime.ts",
1363
- "line": 54,
1363
+ "line": 53,
1364
1364
  "character": 32
1365
1365
  },
1366
1366
  "name": "boolean"
@@ -1371,7 +1371,7 @@
1371
1371
  "__schema": "VariableLikeSchema",
1372
1372
  "location": {
1373
1373
  "filePath": "merge-lanes.main.runtime.ts",
1374
- "line": 55,
1374
+ "line": 54,
1375
1375
  "character": 3
1376
1376
  },
1377
1377
  "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
@@ -1380,7 +1380,7 @@
1380
1380
  "__schema": "TypeRefSchema",
1381
1381
  "location": {
1382
1382
  "filePath": "merge-lanes.main.runtime.ts",
1383
- "line": 55,
1383
+ "line": 54,
1384
1384
  "character": 22
1385
1385
  },
1386
1386
  "name": "MergeStrategy",
@@ -1392,7 +1392,7 @@
1392
1392
  "__schema": "VariableLikeSchema",
1393
1393
  "location": {
1394
1394
  "filePath": "merge-lanes.main.runtime.ts",
1395
- "line": 56,
1395
+ "line": 55,
1396
1396
  "character": 3
1397
1397
  },
1398
1398
  "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1401,7 +1401,7 @@
1401
1401
  "__schema": "KeywordTypeSchema",
1402
1402
  "location": {
1403
1403
  "filePath": "merge-lanes.main.runtime.ts",
1404
- "line": 56,
1404
+ "line": 55,
1405
1405
  "character": 25
1406
1406
  },
1407
1407
  "name": "boolean"
@@ -1412,7 +1412,7 @@
1412
1412
  "__schema": "VariableLikeSchema",
1413
1413
  "location": {
1414
1414
  "filePath": "merge-lanes.main.runtime.ts",
1415
- "line": 57,
1415
+ "line": 56,
1416
1416
  "character": 3
1417
1417
  },
1418
1418
  "signature": "(property) skipFetch?: boolean | undefined",
@@ -1421,7 +1421,7 @@
1421
1421
  "__schema": "KeywordTypeSchema",
1422
1422
  "location": {
1423
1423
  "filePath": "merge-lanes.main.runtime.ts",
1424
- "line": 57,
1424
+ "line": 56,
1425
1425
  "character": 15
1426
1426
  },
1427
1427
  "name": "boolean"
@@ -1432,7 +1432,7 @@
1432
1432
  "__schema": "VariableLikeSchema",
1433
1433
  "location": {
1434
1434
  "filePath": "merge-lanes.main.runtime.ts",
1435
- "line": 58,
1435
+ "line": 57,
1436
1436
  "character": 3
1437
1437
  },
1438
1438
  "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1441,12 +1441,32 @@
1441
1441
  "__schema": "KeywordTypeSchema",
1442
1442
  "location": {
1443
1443
  "filePath": "merge-lanes.main.runtime.ts",
1444
- "line": 58,
1444
+ "line": 57,
1445
1445
  "character": 25
1446
1446
  },
1447
1447
  "name": "boolean"
1448
1448
  },
1449
1449
  "isOptional": true
1450
+ },
1451
+ {
1452
+ "__schema": "VariableLikeSchema",
1453
+ "location": {
1454
+ "filePath": "merge-lanes.main.runtime.ts",
1455
+ "line": 58,
1456
+ "character": 3
1457
+ },
1458
+ "signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
1459
+ "name": "shouldIncludeUpdateDependents",
1460
+ "type": {
1461
+ "__schema": "KeywordTypeSchema",
1462
+ "location": {
1463
+ "filePath": "merge-lanes.main.runtime.ts",
1464
+ "line": 58,
1465
+ "character": 35
1466
+ },
1467
+ "name": "boolean"
1468
+ },
1469
+ "isOptional": true
1450
1470
  }
1451
1471
  ]
1452
1472
  }
@@ -2321,7 +2341,7 @@
2321
2341
  "__schema": "FunctionLikeSchema",
2322
2342
  "location": {
2323
2343
  "filePath": "merge-lanes.main.runtime.ts",
2324
- "line": 278,
2344
+ "line": 281,
2325
2345
  "character": 3
2326
2346
  },
2327
2347
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2331,7 +2351,7 @@
2331
2351
  "__schema": "ParameterSchema",
2332
2352
  "location": {
2333
2353
  "filePath": "merge-lanes.main.runtime.ts",
2334
- "line": 278,
2354
+ "line": 281,
2335
2355
  "character": 24
2336
2356
  },
2337
2357
  "name": "checkoutProps",
@@ -2339,7 +2359,7 @@
2339
2359
  "__schema": "TypeRefSchema",
2340
2360
  "location": {
2341
2361
  "filePath": "merge-lanes.main.runtime.ts",
2342
- "line": 278,
2362
+ "line": 281,
2343
2363
  "character": 39
2344
2364
  },
2345
2365
  "name": "CheckoutProps",
@@ -2355,7 +2375,7 @@
2355
2375
  "__schema": "ParameterSchema",
2356
2376
  "location": {
2357
2377
  "filePath": "merge-lanes.main.runtime.ts",
2358
- "line": 278,
2378
+ "line": 281,
2359
2379
  "character": 54
2360
2380
  },
2361
2381
  "name": "mergeAbortOpts",
@@ -2363,7 +2383,7 @@
2363
2383
  "__schema": "TypeRefSchema",
2364
2384
  "location": {
2365
2385
  "filePath": "merge-lanes.main.runtime.ts",
2366
- "line": 278,
2386
+ "line": 281,
2367
2387
  "character": 70
2368
2388
  },
2369
2389
  "name": "MergeAbortOpts",
@@ -2377,7 +2397,7 @@
2377
2397
  "__schema": "InferenceTypeSchema",
2378
2398
  "location": {
2379
2399
  "filePath": "merge-lanes.main.runtime.ts",
2380
- "line": 278,
2400
+ "line": 281,
2381
2401
  "character": 3
2382
2402
  },
2383
2403
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2390,7 +2410,7 @@
2390
2410
  "__schema": "FunctionLikeSchema",
2391
2411
  "location": {
2392
2412
  "filePath": "merge-lanes.main.runtime.ts",
2393
- "line": 334,
2413
+ "line": 337,
2394
2414
  "character": 3
2395
2415
  },
2396
2416
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2400,7 +2420,7 @@
2400
2420
  "__schema": "ParameterSchema",
2401
2421
  "location": {
2402
2422
  "filePath": "merge-lanes.main.runtime.ts",
2403
- "line": 335,
2423
+ "line": 338,
2404
2424
  "character": 5
2405
2425
  },
2406
2426
  "name": "fromLane",
@@ -2408,7 +2428,7 @@
2408
2428
  "__schema": "KeywordTypeSchema",
2409
2429
  "location": {
2410
2430
  "filePath": "merge-lanes.main.runtime.ts",
2411
- "line": 335,
2431
+ "line": 338,
2412
2432
  "character": 15
2413
2433
  },
2414
2434
  "name": "string"
@@ -2420,7 +2440,7 @@
2420
2440
  "__schema": "ParameterSchema",
2421
2441
  "location": {
2422
2442
  "filePath": "merge-lanes.main.runtime.ts",
2423
- "line": 336,
2443
+ "line": 339,
2424
2444
  "character": 5
2425
2445
  },
2426
2446
  "name": "toLane",
@@ -2428,7 +2448,7 @@
2428
2448
  "__schema": "KeywordTypeSchema",
2429
2449
  "location": {
2430
2450
  "filePath": "merge-lanes.main.runtime.ts",
2431
- "line": 336,
2451
+ "line": 339,
2432
2452
  "character": 13
2433
2453
  },
2434
2454
  "name": "string"
@@ -2440,7 +2460,7 @@
2440
2460
  "__schema": "ParameterSchema",
2441
2461
  "location": {
2442
2462
  "filePath": "merge-lanes.main.runtime.ts",
2443
- "line": 337,
2463
+ "line": 340,
2444
2464
  "character": 5
2445
2465
  },
2446
2466
  "name": "options",
@@ -2448,7 +2468,7 @@
2448
2468
  "__schema": "TypeIntersectionSchema",
2449
2469
  "location": {
2450
2470
  "filePath": "merge-lanes.main.runtime.ts",
2451
- "line": 337,
2471
+ "line": 340,
2452
2472
  "character": 14
2453
2473
  },
2454
2474
  "types": [
@@ -2456,7 +2476,7 @@
2456
2476
  "__schema": "TypeRefSchema",
2457
2477
  "location": {
2458
2478
  "filePath": "merge-lanes.main.runtime.ts",
2459
- "line": 337,
2479
+ "line": 340,
2460
2480
  "character": 14
2461
2481
  },
2462
2482
  "name": "Partial",
@@ -2465,7 +2485,7 @@
2465
2485
  "__schema": "TypeRefSchema",
2466
2486
  "location": {
2467
2487
  "filePath": "merge-lanes.main.runtime.ts",
2468
- "line": 337,
2488
+ "line": 340,
2469
2489
  "character": 22
2470
2490
  },
2471
2491
  "name": "MergeLaneOptions",
@@ -2477,7 +2497,7 @@
2477
2497
  "__schema": "TypeLiteralSchema",
2478
2498
  "location": {
2479
2499
  "filePath": "merge-lanes.main.runtime.ts",
2480
- "line": 337,
2500
+ "line": 340,
2481
2501
  "character": 42
2482
2502
  },
2483
2503
  "members": [
@@ -2485,7 +2505,7 @@
2485
2505
  "__schema": "VariableLikeSchema",
2486
2506
  "location": {
2487
2507
  "filePath": "merge-lanes.main.runtime.ts",
2488
- "line": 337,
2508
+ "line": 340,
2489
2509
  "character": 44
2490
2510
  },
2491
2511
  "signature": "(property) push?: boolean | undefined",
@@ -2494,7 +2514,7 @@
2494
2514
  "__schema": "KeywordTypeSchema",
2495
2515
  "location": {
2496
2516
  "filePath": "merge-lanes.main.runtime.ts",
2497
- "line": 337,
2517
+ "line": 340,
2498
2518
  "character": 51
2499
2519
  },
2500
2520
  "name": "boolean"
@@ -2505,7 +2525,7 @@
2505
2525
  "__schema": "VariableLikeSchema",
2506
2526
  "location": {
2507
2527
  "filePath": "merge-lanes.main.runtime.ts",
2508
- "line": 337,
2528
+ "line": 340,
2509
2529
  "character": 60
2510
2530
  },
2511
2531
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2514,7 +2534,7 @@
2514
2534
  "__schema": "KeywordTypeSchema",
2515
2535
  "location": {
2516
2536
  "filePath": "merge-lanes.main.runtime.ts",
2517
- "line": 337,
2537
+ "line": 340,
2518
2538
  "character": 70
2519
2539
  },
2520
2540
  "name": "boolean"
@@ -2533,7 +2553,7 @@
2533
2553
  "__schema": "TypeRefSchema",
2534
2554
  "location": {
2535
2555
  "filePath": "merge-lanes.main.runtime.ts",
2536
- "line": 338,
2556
+ "line": 341,
2537
2557
  "character": 6
2538
2558
  },
2539
2559
  "name": "Promise",
@@ -2542,7 +2562,7 @@
2542
2562
  "__schema": "TypeRefSchema",
2543
2563
  "location": {
2544
2564
  "filePath": "merge-lanes.main.runtime.ts",
2545
- "line": 338,
2565
+ "line": 341,
2546
2566
  "character": 14
2547
2567
  },
2548
2568
  "name": "MergeFromScopeResult",
@@ -2558,7 +2578,7 @@
2558
2578
  "__schema": "VariableLikeSchema",
2559
2579
  "location": {
2560
2580
  "filePath": "merge-lanes.main.runtime.ts",
2561
- "line": 540,
2581
+ "line": 482,
2562
2582
  "character": 3
2563
2583
  },
2564
2584
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2567,7 +2587,7 @@
2567
2587
  "__schema": "InferenceTypeSchema",
2568
2588
  "location": {
2569
2589
  "filePath": "merge-lanes.main.runtime.ts",
2570
- "line": 540,
2590
+ "line": 482,
2571
2591
  "character": 3
2572
2592
  },
2573
2593
  "type": "never[]"
@@ -2579,7 +2599,7 @@
2579
2599
  "__schema": "VariableLikeSchema",
2580
2600
  "location": {
2581
2601
  "filePath": "merge-lanes.main.runtime.ts",
2582
- "line": 541,
2602
+ "line": 483,
2583
2603
  "character": 3
2584
2604
  },
2585
2605
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2588,7 +2608,7 @@
2588
2608
  "__schema": "InferenceTypeSchema",
2589
2609
  "location": {
2590
2610
  "filePath": "merge-lanes.main.runtime.ts",
2591
- "line": 541,
2611
+ "line": 483,
2592
2612
  "character": 3
2593
2613
  },
2594
2614
  "type": "Aspect[]"
@@ -2600,7 +2620,7 @@
2600
2620
  "__schema": "VariableLikeSchema",
2601
2621
  "location": {
2602
2622
  "filePath": "merge-lanes.main.runtime.ts",
2603
- "line": 554,
2623
+ "line": 496,
2604
2624
  "character": 3
2605
2625
  },
2606
2626
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2609,7 +2629,7 @@
2609
2629
  "__schema": "InferenceTypeSchema",
2610
2630
  "location": {
2611
2631
  "filePath": "merge-lanes.main.runtime.ts",
2612
- "line": 554,
2632
+ "line": 496,
2613
2633
  "character": 3
2614
2634
  },
2615
2635
  "type": "RuntimeDefinition"
@@ -2621,7 +2641,7 @@
2621
2641
  "__schema": "FunctionLikeSchema",
2622
2642
  "location": {
2623
2643
  "filePath": "merge-lanes.main.runtime.ts",
2624
- "line": 556,
2644
+ "line": 498,
2625
2645
  "character": 3
2626
2646
  },
2627
2647
  "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>",
@@ -2631,7 +2651,7 @@
2631
2651
  "__schema": "ParameterSchema",
2632
2652
  "location": {
2633
2653
  "filePath": "merge-lanes.main.runtime.ts",
2634
- "line": 556,
2654
+ "line": 498,
2635
2655
  "character": 25
2636
2656
  },
2637
2657
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2639,7 +2659,7 @@
2639
2659
  "__schema": "TupleTypeSchema",
2640
2660
  "location": {
2641
2661
  "filePath": "merge-lanes.main.runtime.ts",
2642
- "line": 568,
2662
+ "line": 510,
2643
2663
  "character": 6
2644
2664
  },
2645
2665
  "elements": [
@@ -2647,7 +2667,7 @@
2647
2667
  "__schema": "TypeRefSchema",
2648
2668
  "location": {
2649
2669
  "filePath": "merge-lanes.main.runtime.ts",
2650
- "line": 569,
2670
+ "line": 511,
2651
2671
  "character": 5
2652
2672
  },
2653
2673
  "name": "LanesMain",
@@ -2660,7 +2680,7 @@
2660
2680
  "__schema": "TypeRefSchema",
2661
2681
  "location": {
2662
2682
  "filePath": "merge-lanes.main.runtime.ts",
2663
- "line": 570,
2683
+ "line": 512,
2664
2684
  "character": 5
2665
2685
  },
2666
2686
  "name": "CLIMain",
@@ -2673,7 +2693,7 @@
2673
2693
  "__schema": "TypeRefSchema",
2674
2694
  "location": {
2675
2695
  "filePath": "merge-lanes.main.runtime.ts",
2676
- "line": 571,
2696
+ "line": 513,
2677
2697
  "character": 5
2678
2698
  },
2679
2699
  "name": "Workspace",
@@ -2686,7 +2706,7 @@
2686
2706
  "__schema": "TypeRefSchema",
2687
2707
  "location": {
2688
2708
  "filePath": "merge-lanes.main.runtime.ts",
2689
- "line": 572,
2709
+ "line": 514,
2690
2710
  "character": 5
2691
2711
  },
2692
2712
  "name": "MergingMain",
@@ -2699,7 +2719,7 @@
2699
2719
  "__schema": "TypeRefSchema",
2700
2720
  "location": {
2701
2721
  "filePath": "merge-lanes.main.runtime.ts",
2702
- "line": 573,
2722
+ "line": 515,
2703
2723
  "character": 5
2704
2724
  },
2705
2725
  "name": "LoggerMain",
@@ -2712,7 +2732,7 @@
2712
2732
  "__schema": "TypeRefSchema",
2713
2733
  "location": {
2714
2734
  "filePath": "merge-lanes.main.runtime.ts",
2715
- "line": 574,
2735
+ "line": 516,
2716
2736
  "character": 5
2717
2737
  },
2718
2738
  "name": "RemoveMain",
@@ -2725,7 +2745,7 @@
2725
2745
  "__schema": "TypeRefSchema",
2726
2746
  "location": {
2727
2747
  "filePath": "merge-lanes.main.runtime.ts",
2728
- "line": 575,
2748
+ "line": 517,
2729
2749
  "character": 5
2730
2750
  },
2731
2751
  "name": "ScopeMain",
@@ -2738,7 +2758,7 @@
2738
2758
  "__schema": "TypeRefSchema",
2739
2759
  "location": {
2740
2760
  "filePath": "merge-lanes.main.runtime.ts",
2741
- "line": 576,
2761
+ "line": 518,
2742
2762
  "character": 5
2743
2763
  },
2744
2764
  "name": "ExportMain",
@@ -2751,7 +2771,7 @@
2751
2771
  "__schema": "TypeRefSchema",
2752
2772
  "location": {
2753
2773
  "filePath": "merge-lanes.main.runtime.ts",
2754
- "line": 577,
2774
+ "line": 519,
2755
2775
  "character": 5
2756
2776
  },
2757
2777
  "name": "ImporterMain",
@@ -2764,7 +2784,7 @@
2764
2784
  "__schema": "TypeRefSchema",
2765
2785
  "location": {
2766
2786
  "filePath": "merge-lanes.main.runtime.ts",
2767
- "line": 578,
2787
+ "line": 520,
2768
2788
  "character": 5
2769
2789
  },
2770
2790
  "name": "CheckoutMain",
@@ -2777,7 +2797,7 @@
2777
2797
  "__schema": "TypeRefSchema",
2778
2798
  "location": {
2779
2799
  "filePath": "merge-lanes.main.runtime.ts",
2780
- "line": 579,
2800
+ "line": 521,
2781
2801
  "character": 5
2782
2802
  },
2783
2803
  "name": "GlobalConfigMain",
@@ -2796,7 +2816,7 @@
2796
2816
  "__schema": "InferenceTypeSchema",
2797
2817
  "location": {
2798
2818
  "filePath": "merge-lanes.main.runtime.ts",
2799
- "line": 556,
2819
+ "line": 498,
2800
2820
  "character": 3
2801
2821
  },
2802
2822
  "type": "Promise<MergeLanesMain>"
@@ -2814,7 +2834,7 @@
2814
2834
  "__schema": "UnImplementedSchema",
2815
2835
  "location": {
2816
2836
  "filePath": "merge-lanes.main.runtime.ts",
2817
- "line": 849,
2837
+ "line": 793,
2818
2838
  "character": 16
2819
2839
  },
2820
2840
  "name": "MergeLanesMain",
@@ -2826,7 +2846,7 @@
2826
2846
  "__schema": "FunctionLikeSchema",
2827
2847
  "location": {
2828
2848
  "filePath": "merge-lanes.main.runtime.ts",
2829
- "line": 601,
2849
+ "line": 543,
2830
2850
  "character": 1
2831
2851
  },
2832
2852
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -2836,7 +2856,7 @@
2836
2856
  "__schema": "ParameterSchema",
2837
2857
  "location": {
2838
2858
  "filePath": "merge-lanes.main.runtime.ts",
2839
- "line": 602,
2859
+ "line": 544,
2840
2860
  "character": 3
2841
2861
  },
2842
2862
  "name": "allComponentsStatus",
@@ -2844,14 +2864,14 @@
2844
2864
  "__schema": "TypeArraySchema",
2845
2865
  "location": {
2846
2866
  "filePath": "merge-lanes.main.runtime.ts",
2847
- "line": 602,
2867
+ "line": 544,
2848
2868
  "character": 24
2849
2869
  },
2850
2870
  "type": {
2851
2871
  "__schema": "TypeRefSchema",
2852
2872
  "location": {
2853
2873
  "filePath": "merge-lanes.main.runtime.ts",
2854
- "line": 602,
2874
+ "line": 544,
2855
2875
  "character": 24
2856
2876
  },
2857
2877
  "name": "ComponentMergeStatus",
@@ -2868,7 +2888,7 @@
2868
2888
  "__schema": "ParameterSchema",
2869
2889
  "location": {
2870
2890
  "filePath": "merge-lanes.main.runtime.ts",
2871
- "line": 603,
2891
+ "line": 545,
2872
2892
  "character": 3
2873
2893
  },
2874
2894
  "name": "compIdsToKeep",
@@ -2876,14 +2896,14 @@
2876
2896
  "__schema": "TypeArraySchema",
2877
2897
  "location": {
2878
2898
  "filePath": "merge-lanes.main.runtime.ts",
2879
- "line": 603,
2899
+ "line": 545,
2880
2900
  "character": 18
2881
2901
  },
2882
2902
  "type": {
2883
2903
  "__schema": "TypeRefSchema",
2884
2904
  "location": {
2885
2905
  "filePath": "merge-lanes.main.runtime.ts",
2886
- "line": 603,
2906
+ "line": 545,
2887
2907
  "character": 18
2888
2908
  },
2889
2909
  "name": "ComponentID",
@@ -2901,7 +2921,7 @@
2901
2921
  "__schema": "ParameterSchema",
2902
2922
  "location": {
2903
2923
  "filePath": "merge-lanes.main.runtime.ts",
2904
- "line": 604,
2924
+ "line": 546,
2905
2925
  "character": 3
2906
2926
  },
2907
2927
  "name": "allBitIds",
@@ -2909,14 +2929,14 @@
2909
2929
  "__schema": "TypeArraySchema",
2910
2930
  "location": {
2911
2931
  "filePath": "merge-lanes.main.runtime.ts",
2912
- "line": 604,
2932
+ "line": 546,
2913
2933
  "character": 14
2914
2934
  },
2915
2935
  "type": {
2916
2936
  "__schema": "TypeRefSchema",
2917
2937
  "location": {
2918
2938
  "filePath": "merge-lanes.main.runtime.ts",
2919
- "line": 604,
2939
+ "line": 546,
2920
2940
  "character": 14
2921
2941
  },
2922
2942
  "name": "ComponentID",
@@ -2934,7 +2954,7 @@
2934
2954
  "__schema": "ParameterSchema",
2935
2955
  "location": {
2936
2956
  "filePath": "merge-lanes.main.runtime.ts",
2937
- "line": 605,
2957
+ "line": 547,
2938
2958
  "character": 3
2939
2959
  },
2940
2960
  "name": "legacyScope",
@@ -2942,7 +2962,7 @@
2942
2962
  "__schema": "TypeRefSchema",
2943
2963
  "location": {
2944
2964
  "filePath": "merge-lanes.main.runtime.ts",
2945
- "line": 605,
2965
+ "line": 547,
2946
2966
  "character": 16
2947
2967
  },
2948
2968
  "name": "LegacyScope"
@@ -2954,7 +2974,7 @@
2954
2974
  "__schema": "ParameterSchema",
2955
2975
  "location": {
2956
2976
  "filePath": "merge-lanes.main.runtime.ts",
2957
- "line": 606,
2977
+ "line": 548,
2958
2978
  "character": 3
2959
2979
  },
2960
2980
  "name": "includeDeps",
@@ -2962,7 +2982,7 @@
2962
2982
  "__schema": "InferenceTypeSchema",
2963
2983
  "location": {
2964
2984
  "filePath": "merge-lanes.main.runtime.ts",
2965
- "line": 606,
2985
+ "line": 548,
2966
2986
  "character": 3
2967
2987
  },
2968
2988
  "type": "boolean"
@@ -2975,7 +2995,7 @@
2975
2995
  "__schema": "ParameterSchema",
2976
2996
  "location": {
2977
2997
  "filePath": "merge-lanes.main.runtime.ts",
2978
- "line": 607,
2998
+ "line": 549,
2979
2999
  "character": 3
2980
3000
  },
2981
3001
  "name": "otherLane",
@@ -2983,7 +3003,7 @@
2983
3003
  "__schema": "TypeRefSchema",
2984
3004
  "location": {
2985
3005
  "filePath": "merge-lanes.main.runtime.ts",
2986
- "line": 607,
3006
+ "line": 549,
2987
3007
  "character": 15
2988
3008
  },
2989
3009
  "name": "Lane",
@@ -2996,7 +3016,7 @@
2996
3016
  "__schema": "ParameterSchema",
2997
3017
  "location": {
2998
3018
  "filePath": "merge-lanes.main.runtime.ts",
2999
- "line": 608,
3019
+ "line": 550,
3000
3020
  "character": 3
3001
3021
  },
3002
3022
  "name": "shouldSquash",
@@ -3004,7 +3024,7 @@
3004
3024
  "__schema": "KeywordTypeSchema",
3005
3025
  "location": {
3006
3026
  "filePath": "merge-lanes.main.runtime.ts",
3007
- "line": 608,
3027
+ "line": 550,
3008
3028
  "character": 18
3009
3029
  },
3010
3030
  "name": "boolean"
@@ -3017,7 +3037,7 @@
3017
3037
  "__schema": "TypeRefSchema",
3018
3038
  "location": {
3019
3039
  "filePath": "merge-lanes.main.runtime.ts",
3020
- "line": 609,
3040
+ "line": 551,
3021
3041
  "character": 4
3022
3042
  },
3023
3043
  "name": "Promise",
@@ -3026,14 +3046,14 @@
3026
3046
  "__schema": "TypeArraySchema",
3027
3047
  "location": {
3028
3048
  "filePath": "merge-lanes.main.runtime.ts",
3029
- "line": 609,
3049
+ "line": 551,
3030
3050
  "character": 12
3031
3051
  },
3032
3052
  "type": {
3033
3053
  "__schema": "TypeRefSchema",
3034
3054
  "location": {
3035
3055
  "filePath": "merge-lanes.main.runtime.ts",
3036
- "line": 609,
3056
+ "line": 551,
3037
3057
  "character": 12
3038
3058
  },
3039
3059
  "name": "ComponentMergeStatus",
@@ -3053,7 +3073,7 @@
3053
3073
  "__schema": "FunctionLikeSchema",
3054
3074
  "location": {
3055
3075
  "filePath": "merge-lanes.main.runtime.ts",
3056
- "line": 718,
3076
+ "line": 660,
3057
3077
  "character": 1
3058
3078
  },
3059
3079
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -3063,7 +3083,7 @@
3063
3083
  "__schema": "ParameterSchema",
3064
3084
  "location": {
3065
3085
  "filePath": "merge-lanes.main.runtime.ts",
3066
- "line": 718,
3086
+ "line": 660,
3067
3087
  "character": 32
3068
3088
  },
3069
3089
  "name": "otherLaneId",
@@ -3071,7 +3091,7 @@
3071
3091
  "__schema": "TypeRefSchema",
3072
3092
  "location": {
3073
3093
  "filePath": "merge-lanes.main.runtime.ts",
3074
- "line": 718,
3094
+ "line": 660,
3075
3095
  "character": 45
3076
3096
  },
3077
3097
  "name": "LaneId",
@@ -3089,7 +3109,7 @@
3089
3109
  "__schema": "InferenceTypeSchema",
3090
3110
  "location": {
3091
3111
  "filePath": "merge-lanes.main.runtime.ts",
3092
- "line": 718,
3112
+ "line": 660,
3093
3113
  "character": 1
3094
3114
  },
3095
3115
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -3102,17 +3122,17 @@
3102
3122
  "__schema": "FunctionLikeSchema",
3103
3123
  "location": {
3104
3124
  "filePath": "merge-lanes.main.runtime.ts",
3105
- "line": 727,
3125
+ "line": 669,
3106
3126
  "character": 1
3107
3127
  },
3108
- "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope): Promise<void>",
3128
+ "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
3109
3129
  "name": "squashSnaps",
3110
3130
  "params": [
3111
3131
  {
3112
3132
  "__schema": "ParameterSchema",
3113
3133
  "location": {
3114
3134
  "filePath": "merge-lanes.main.runtime.ts",
3115
- "line": 728,
3135
+ "line": 670,
3116
3136
  "character": 3
3117
3137
  },
3118
3138
  "name": "allComponentsStatus",
@@ -3120,14 +3140,14 @@
3120
3140
  "__schema": "TypeArraySchema",
3121
3141
  "location": {
3122
3142
  "filePath": "merge-lanes.main.runtime.ts",
3123
- "line": 728,
3143
+ "line": 670,
3124
3144
  "character": 24
3125
3145
  },
3126
3146
  "type": {
3127
3147
  "__schema": "TypeRefSchema",
3128
3148
  "location": {
3129
3149
  "filePath": "merge-lanes.main.runtime.ts",
3130
- "line": 728,
3150
+ "line": 670,
3131
3151
  "character": 24
3132
3152
  },
3133
3153
  "name": "ComponentMergeStatus",
@@ -3144,7 +3164,7 @@
3144
3164
  "__schema": "ParameterSchema",
3145
3165
  "location": {
3146
3166
  "filePath": "merge-lanes.main.runtime.ts",
3147
- "line": 729,
3167
+ "line": 671,
3148
3168
  "character": 3
3149
3169
  },
3150
3170
  "name": "currentLaneId",
@@ -3152,7 +3172,7 @@
3152
3172
  "__schema": "TypeRefSchema",
3153
3173
  "location": {
3154
3174
  "filePath": "merge-lanes.main.runtime.ts",
3155
- "line": 729,
3175
+ "line": 671,
3156
3176
  "character": 18
3157
3177
  },
3158
3178
  "name": "LaneId",
@@ -3169,7 +3189,7 @@
3169
3189
  "__schema": "ParameterSchema",
3170
3190
  "location": {
3171
3191
  "filePath": "merge-lanes.main.runtime.ts",
3172
- "line": 730,
3192
+ "line": 672,
3173
3193
  "character": 3
3174
3194
  },
3175
3195
  "name": "otherLaneId",
@@ -3177,7 +3197,7 @@
3177
3197
  "__schema": "TypeRefSchema",
3178
3198
  "location": {
3179
3199
  "filePath": "merge-lanes.main.runtime.ts",
3180
- "line": 730,
3200
+ "line": 672,
3181
3201
  "character": 16
3182
3202
  },
3183
3203
  "name": "LaneId",
@@ -3194,7 +3214,7 @@
3194
3214
  "__schema": "ParameterSchema",
3195
3215
  "location": {
3196
3216
  "filePath": "merge-lanes.main.runtime.ts",
3197
- "line": 731,
3217
+ "line": 673,
3198
3218
  "character": 3
3199
3219
  },
3200
3220
  "name": "scope",
@@ -3202,20 +3222,40 @@
3202
3222
  "__schema": "TypeRefSchema",
3203
3223
  "location": {
3204
3224
  "filePath": "merge-lanes.main.runtime.ts",
3205
- "line": 731,
3225
+ "line": 673,
3206
3226
  "character": 10
3207
3227
  },
3208
3228
  "name": "LegacyScope"
3209
3229
  },
3210
3230
  "isOptional": false,
3211
3231
  "isSpread": false
3232
+ },
3233
+ {
3234
+ "__schema": "ParameterSchema",
3235
+ "location": {
3236
+ "filePath": "merge-lanes.main.runtime.ts",
3237
+ "line": 674,
3238
+ "character": 3
3239
+ },
3240
+ "name": "messageTitle",
3241
+ "type": {
3242
+ "__schema": "KeywordTypeSchema",
3243
+ "location": {
3244
+ "filePath": "merge-lanes.main.runtime.ts",
3245
+ "line": 674,
3246
+ "character": 18
3247
+ },
3248
+ "name": "string"
3249
+ },
3250
+ "isOptional": true,
3251
+ "isSpread": false
3212
3252
  }
3213
3253
  ],
3214
3254
  "returnType": {
3215
3255
  "__schema": "InferenceTypeSchema",
3216
3256
  "location": {
3217
3257
  "filePath": "merge-lanes.main.runtime.ts",
3218
- "line": 727,
3258
+ "line": 669,
3219
3259
  "character": 1
3220
3260
  },
3221
3261
  "type": "Promise<void>"
@@ -3228,14 +3268,14 @@
3228
3268
  "__schema": "FunctionLikeSchema",
3229
3269
  "location": {
3230
3270
  "filePath": "merge-lanes.main.runtime.ts",
3231
- "line": 765,
3271
+ "line": 709,
3232
3272
  "character": 1
3233
3273
  },
3234
3274
  "doc": {
3235
3275
  "__schema": "DocSchema",
3236
3276
  "location": {
3237
3277
  "filePath": "merge-lanes.main.runtime.ts",
3238
- "line": 762,
3278
+ "line": 706,
3239
3279
  "character": 1
3240
3280
  },
3241
3281
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3248,7 +3288,7 @@
3248
3288
  "__schema": "ParameterSchema",
3249
3289
  "location": {
3250
3290
  "filePath": "merge-lanes.main.runtime.ts",
3251
- "line": 766,
3291
+ "line": 710,
3252
3292
  "character": 3
3253
3293
  },
3254
3294
  "name": "currentLaneName",
@@ -3256,7 +3296,7 @@
3256
3296
  "__schema": "KeywordTypeSchema",
3257
3297
  "location": {
3258
3298
  "filePath": "merge-lanes.main.runtime.ts",
3259
- "line": 766,
3299
+ "line": 710,
3260
3300
  "character": 20
3261
3301
  },
3262
3302
  "name": "string"
@@ -3268,7 +3308,7 @@
3268
3308
  "__schema": "ParameterSchema",
3269
3309
  "location": {
3270
3310
  "filePath": "merge-lanes.main.runtime.ts",
3271
- "line": 767,
3311
+ "line": 711,
3272
3312
  "character": 3
3273
3313
  },
3274
3314
  "name": "otherLaneId",
@@ -3276,7 +3316,7 @@
3276
3316
  "__schema": "TypeRefSchema",
3277
3317
  "location": {
3278
3318
  "filePath": "merge-lanes.main.runtime.ts",
3279
- "line": 767,
3319
+ "line": 711,
3280
3320
  "character": 16
3281
3321
  },
3282
3322
  "name": "LaneId",
@@ -3293,7 +3333,7 @@
3293
3333
  "__schema": "ParameterSchema",
3294
3334
  "location": {
3295
3335
  "filePath": "merge-lanes.main.runtime.ts",
3296
- "line": 768,
3336
+ "line": 712,
3297
3337
  "character": 3
3298
3338
  },
3299
3339
  "name": "id",
@@ -3301,7 +3341,7 @@
3301
3341
  "__schema": "TypeRefSchema",
3302
3342
  "location": {
3303
3343
  "filePath": "merge-lanes.main.runtime.ts",
3304
- "line": 768,
3344
+ "line": 712,
3305
3345
  "character": 7
3306
3346
  },
3307
3347
  "name": "ComponentID",
@@ -3318,7 +3358,7 @@
3318
3358
  "__schema": "ParameterSchema",
3319
3359
  "location": {
3320
3360
  "filePath": "merge-lanes.main.runtime.ts",
3321
- "line": 769,
3361
+ "line": 713,
3322
3362
  "character": 3
3323
3363
  },
3324
3364
  "name": "divergeData",
@@ -3326,7 +3366,7 @@
3326
3366
  "__schema": "TypeRefSchema",
3327
3367
  "location": {
3328
3368
  "filePath": "merge-lanes.main.runtime.ts",
3329
- "line": 769,
3369
+ "line": 713,
3330
3370
  "character": 16
3331
3371
  },
3332
3372
  "name": "SnapsDistance",
@@ -3339,7 +3379,7 @@
3339
3379
  "__schema": "ParameterSchema",
3340
3380
  "location": {
3341
3381
  "filePath": "merge-lanes.main.runtime.ts",
3342
- "line": 770,
3382
+ "line": 714,
3343
3383
  "character": 3
3344
3384
  },
3345
3385
  "name": "log",
@@ -3347,7 +3387,7 @@
3347
3387
  "__schema": "TypeRefSchema",
3348
3388
  "location": {
3349
3389
  "filePath": "merge-lanes.main.runtime.ts",
3350
- "line": 770,
3390
+ "line": 714,
3351
3391
  "character": 8
3352
3392
  },
3353
3393
  "name": "Log",
@@ -3360,7 +3400,7 @@
3360
3400
  "__schema": "ParameterSchema",
3361
3401
  "location": {
3362
3402
  "filePath": "merge-lanes.main.runtime.ts",
3363
- "line": 771,
3403
+ "line": 715,
3364
3404
  "character": 3
3365
3405
  },
3366
3406
  "name": "scope",
@@ -3368,7 +3408,7 @@
3368
3408
  "__schema": "TypeRefSchema",
3369
3409
  "location": {
3370
3410
  "filePath": "merge-lanes.main.runtime.ts",
3371
- "line": 771,
3411
+ "line": 715,
3372
3412
  "character": 10
3373
3413
  },
3374
3414
  "name": "LegacyScope"
@@ -3380,7 +3420,7 @@
3380
3420
  "__schema": "ParameterSchema",
3381
3421
  "location": {
3382
3422
  "filePath": "merge-lanes.main.runtime.ts",
3383
- "line": 772,
3423
+ "line": 716,
3384
3424
  "character": 3
3385
3425
  },
3386
3426
  "name": "componentFromModel",
@@ -3388,7 +3428,7 @@
3388
3428
  "__schema": "TypeRefSchema",
3389
3429
  "location": {
3390
3430
  "filePath": "merge-lanes.main.runtime.ts",
3391
- "line": 772,
3431
+ "line": 716,
3392
3432
  "character": 24
3393
3433
  },
3394
3434
  "name": "Version",
@@ -3401,7 +3441,7 @@
3401
3441
  "__schema": "ParameterSchema",
3402
3442
  "location": {
3403
3443
  "filePath": "merge-lanes.main.runtime.ts",
3404
- "line": 773,
3444
+ "line": 717,
3405
3445
  "character": 3
3406
3446
  },
3407
3447
  "name": "messageTitle",
@@ -3409,7 +3449,7 @@
3409
3449
  "__schema": "KeywordTypeSchema",
3410
3450
  "location": {
3411
3451
  "filePath": "merge-lanes.main.runtime.ts",
3412
- "line": 773,
3452
+ "line": 717,
3413
3453
  "character": 18
3414
3454
  },
3415
3455
  "name": "string"
@@ -3422,7 +3462,7 @@
3422
3462
  "__schema": "TypeRefSchema",
3423
3463
  "location": {
3424
3464
  "filePath": "merge-lanes.main.runtime.ts",
3425
- "line": 774,
3465
+ "line": 718,
3426
3466
  "character": 4
3427
3467
  },
3428
3468
  "name": "Promise",
@@ -3431,7 +3471,7 @@
3431
3471
  "__schema": "TypeUnionSchema",
3432
3472
  "location": {
3433
3473
  "filePath": "merge-lanes.main.runtime.ts",
3434
- "line": 774,
3474
+ "line": 718,
3435
3475
  "character": 12
3436
3476
  },
3437
3477
  "types": [
@@ -3439,7 +3479,7 @@
3439
3479
  "__schema": "TypeRefSchema",
3440
3480
  "location": {
3441
3481
  "filePath": "merge-lanes.main.runtime.ts",
3442
- "line": 774,
3482
+ "line": 718,
3443
3483
  "character": 12
3444
3484
  },
3445
3485
  "name": "Version",
@@ -3449,7 +3489,7 @@
3449
3489
  "__schema": "KeywordTypeSchema",
3450
3490
  "location": {
3451
3491
  "filePath": "merge-lanes.main.runtime.ts",
3452
- "line": 774,
3492
+ "line": 718,
3453
3493
  "character": 22
3454
3494
  },
3455
3495
  "name": "undefined"
@@ -3466,7 +3506,7 @@
3466
3506
  "__schema": "UnImplementedSchema",
3467
3507
  "location": {
3468
3508
  "filePath": "merge-lanes.main.runtime.ts",
3469
- "line": 847,
3509
+ "line": 791,
3470
3510
  "character": 1
3471
3511
  },
3472
3512
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3515,7 +3555,7 @@
3515
3555
  "componentId": {
3516
3556
  "scope": "teambit.lanes",
3517
3557
  "name": "merge-lanes",
3518
- "version": "1.0.224"
3558
+ "version": "1.0.226"
3519
3559
  },
3520
3560
  "taggedModuleExports": []
3521
3561
  }