Fix merge conflicts

Author: jakebailey

tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt

@@ -1,43 +1,25 @@
-duplicateSymbolsExportMatching.ts(1,1): error TS1185: Merge conflict marker encountered.
-duplicateSymbolsExportMatching.ts(3,1): error TS1185: Merge conflict marker encountered.
-duplicateSymbolsExportMatching.ts(5,1): error TS1185: Merge conflict marker encountered.
-duplicateSymbolsExportMatching.ts(7,1): error TS1185: Merge conflict marker encountered.
-duplicateSymbolsExportMatching.ts(30,15): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(31,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(32,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(33,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(38,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(41,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(48,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(49,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(50,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(51,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(55,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(55,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged.
-duplicateSymbolsExportMatching.ts(58,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(62,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(63,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(64,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(70,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(71,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(24,15): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(25,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(26,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(27,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(32,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(35,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(42,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(43,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(44,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(45,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(49,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(49,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged.
+duplicateSymbolsExportMatching.ts(52,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(56,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(57,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(58,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(64,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
 
 
-==== duplicateSymbolsExportMatching.ts (22 errors) ====
-    <<<<<<< HEAD
-    ~~~~~~~
-!!! error TS1185: Merge conflict marker encountered.
-    module M {
-    ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    ~~~~~~~
-!!! error TS1185: Merge conflict marker encountered.
-    namespace M {
-    =======
-    ~~~~~~~
-!!! error TS1185: Merge conflict marker encountered.
+==== duplicateSymbolsExportMatching.ts (18 errors) ====
     namespace M {
-    >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    ~~~~~~~
-!!! error TS1185: Merge conflict marker encountered.
         export interface E { }
         interface I { }
     }

tests/baselines/reference/duplicateSymbolsExportMatching.js

@@ -1,13 +1,7 @@
 //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] ////
 
 //// [duplicateSymbolsExportMatching.ts]
-<<<<<<< HEAD
-module M {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-namespace M {
-=======
 namespace M {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface E { }
     interface I { }
 }

tests/baselines/reference/duplicateSymbolsExportMatching.symbols

@@ -1,143 +1,137 @@
 //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] ////
 
 === duplicateSymbolsExportMatching.ts ===
-<<<<<<< HEAD
-module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 namespace M {
-=======
-namespace M {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+
     export interface E { }
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 1, 10), Decl(duplicateSymbolsExportMatching.ts, 10, 10))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 13), Decl(duplicateSymbolsExportMatching.ts, 4, 10))
 
     interface I { }
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 7, 26))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 1, 26))
 }
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
 
     export interface E { } // ok
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 1, 10), Decl(duplicateSymbolsExportMatching.ts, 10, 10))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 13), Decl(duplicateSymbolsExportMatching.ts, 4, 10))
 
     interface I { } // ok
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 11, 26))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 5, 26))
 }
 
 // Doesn't match export visibility, but it's in a different parent, so it's ok
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
 
     interface E { } // ok
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 16, 10))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 10, 10))
 
     export interface I { } // ok
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 17, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 11, 19))
 }
 
 module N {
->N : Symbol(N, Decl(duplicateSymbolsExportMatching.ts, 19, 1))
+>N : Symbol(N, Decl(duplicateSymbolsExportMatching.ts, 13, 1))
 
     interface I { }
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 21, 10), Decl(duplicateSymbolsExportMatching.ts, 22, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 10), Decl(duplicateSymbolsExportMatching.ts, 16, 19))
 
     interface I { } // ok
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 21, 10), Decl(duplicateSymbolsExportMatching.ts, 22, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 10), Decl(duplicateSymbolsExportMatching.ts, 16, 19))
 
     export interface E { }
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 23, 19), Decl(duplicateSymbolsExportMatching.ts, 24, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 17, 19), Decl(duplicateSymbolsExportMatching.ts, 18, 26))
 
     export interface E { } // ok
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 23, 19), Decl(duplicateSymbolsExportMatching.ts, 24, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 17, 19), Decl(duplicateSymbolsExportMatching.ts, 18, 26))
 }
 
 module N2 {
->N2 : Symbol(N2, Decl(duplicateSymbolsExportMatching.ts, 26, 1))
+>N2 : Symbol(N2, Decl(duplicateSymbolsExportMatching.ts, 20, 1))
 
     interface I { }
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 28, 11), Decl(duplicateSymbolsExportMatching.ts, 29, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 22, 11), Decl(duplicateSymbolsExportMatching.ts, 23, 19))
 
     export interface I { } // error
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 29, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 23, 19))
 
     export interface E { }
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 30, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 24, 26))
 
     interface E { } // error
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 30, 26), Decl(duplicateSymbolsExportMatching.ts, 31, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 24, 26), Decl(duplicateSymbolsExportMatching.ts, 25, 26))
 }
 
 // Should report error only once for instantiated module
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
 
     module inst {
->inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 36, 10), Decl(duplicateSymbolsExportMatching.ts, 39, 5))
+>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 30, 10), Decl(duplicateSymbolsExportMatching.ts, 33, 5))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 38, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 32, 11))
     }
     export module inst { // one error
->inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 39, 5))
+>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 33, 5))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 41, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 35, 11))
     }
 }
 
 // Variables of the same / different type
 module M2 {
->M2 : Symbol(M2, Decl(duplicateSymbolsExportMatching.ts, 43, 1))
+>M2 : Symbol(M2, Decl(duplicateSymbolsExportMatching.ts, 37, 1))
 
     var v: string;
->v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 47, 7), Decl(duplicateSymbolsExportMatching.ts, 48, 14))
+>v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 41, 7), Decl(duplicateSymbolsExportMatching.ts, 42, 14))
 
     export var v: string; // one error (visibility)
->v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 48, 14))
+>v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 42, 14))
 
     var w: number;
->w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 49, 7), Decl(duplicateSymbolsExportMatching.ts, 50, 14))
+>w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 43, 7), Decl(duplicateSymbolsExportMatching.ts, 44, 14))
 
     export var w: string; // two errors (visibility and type mismatch)
->w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 50, 14))
+>w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 44, 14))
 }
 
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
 
     module F {
->F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 56, 5), Decl(duplicateSymbolsExportMatching.ts, 53, 10))
+>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5), Decl(duplicateSymbolsExportMatching.ts, 47, 10))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 55, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 49, 11))
     }
     export function F() { } // Only one error for duplicate identifier (don't consider visibility)
->F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 56, 5))
+>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5))
 }
 
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
 
     class C { }
->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 60, 10), Decl(duplicateSymbolsExportMatching.ts, 61, 15), Decl(duplicateSymbolsExportMatching.ts, 62, 16))
+>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 10), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 16))
 
     module C { }
->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 60, 10), Decl(duplicateSymbolsExportMatching.ts, 61, 15), Decl(duplicateSymbolsExportMatching.ts, 62, 16))
+>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 10), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 16))
 
     export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 62, 16))
+>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 56, 16))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 64, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 58, 11))
     }
 }
 
 // Top level
 interface D { }
->D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 66, 1), Decl(duplicateSymbolsExportMatching.ts, 69, 15))
+>D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 60, 1), Decl(duplicateSymbolsExportMatching.ts, 63, 15))
 
 export interface D { }
->D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 69, 15))
+>D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 63, 15))
 

tests/baselines/reference/duplicateSymbolsExportMatching.types

@@ -1,13 +1,7 @@
 //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] ////
 
 === duplicateSymbolsExportMatching.ts ===
-<<<<<<< HEAD
-module M {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-namespace M {
-=======
 namespace M {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface E { }
     interface I { }
 }