fetching https://github.com/ljmf00/dmd.git implement-dip-1029 (attempt: 1/3) From https://github.com/ljmf00/dmd * branch implement-dip-1029 -> FETCH_HEAD merging FETCH_HEAD CONFLICT (modify/delete): src/tests/cxxfrontend.c deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/tests/cxxfrontend.c left in tree. CONFLICT (file location): test/compilable/hdrgen_dip1029.d added in 206393a42ee11c85234f43c862e04f145c64d62f inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/hdrgen_dip1029.d. CONFLICT (file location): test/fail_compilation/dip1029_2.d added in 206393a42ee11c85234f43c862e04f145c64d62f inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/dip1029_2.d. CONFLICT (file location): test/fail_compilation/dip1029_1.d added in 206393a42ee11c85234f43c862e04f145c64d62f inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/dip1029_1.d. CONFLICT (file location): test/compilable/dip1029.d added in 206393a42ee11c85234f43c862e04f145c64d62f inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/dip1029.d. Auto-merging compiler/src/dmd/typesem.d Auto-merging compiler/src/dmd/traits.d CONFLICT (content): Merge conflict in compiler/src/dmd/traits.d Auto-merging compiler/src/dmd/todt.d CONFLICT (content): Merge conflict in compiler/src/dmd/todt.d Auto-merging compiler/src/dmd/sideeffect.d Auto-merging compiler/src/dmd/semantic3.d CONFLICT (content): Merge conflict in compiler/src/dmd/semantic3.d Auto-merging compiler/src/dmd/parse.d CONFLICT (content): Merge conflict in compiler/src/dmd/parse.d Auto-merging compiler/src/dmd/mtype.h Auto-merging compiler/src/dmd/mtype.d CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.d Auto-merging compiler/src/dmd/hdrgen.d Auto-merging compiler/src/dmd/glue.d Auto-merging compiler/src/dmd/func.d CONFLICT (content): Merge conflict in compiler/src/dmd/func.d Auto-merging compiler/src/dmd/frontend.h CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h Auto-merging compiler/src/dmd/expression.d Auto-merging compiler/src/dmd/dsymbolsem.d CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbolsem.d Auto-merging compiler/src/dmd/dmangle.d Auto-merging compiler/src/dmd/dcast.d Auto-merging compiler/src/dmd/clone.d Auto-merging compiler/src/dmd/canthrow.d Auto-merging compiler/src/dmd/astenums.d Auto-merging compiler/src/dmd/astbase.d Automatic merge failed; fix conflicts and then commit the result.