fetching https://github.com/Geod24/dmd.git fix-5309 (attempt: 1/3) From https://github.com/Geod24/dmd * branch fix-5309 -> FETCH_HEAD merging FETCH_HEAD CONFLICT (file location): test/runnable/test5309.d added in 06626244628eff4c041f21517d8d5b9733eea83c inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/test5309.d. CONFLICT (file location): test/runnable/imports/test5309.d added in 06626244628eff4c041f21517d8d5b9733eea83c inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/imports/test5309.d. CONFLICT (file location): test/fail_compilation/test5309.d added in 06626244628eff4c041f21517d8d5b9733eea83c inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/test5309.d. Auto-merging compiler/src/dmd/traits.d Auto-merging compiler/src/dmd/scope.h Auto-merging compiler/src/dmd/parse.d CONFLICT (content): Merge conflict in compiler/src/dmd/parse.d Auto-merging compiler/src/dmd/hdrgen.d Auto-merging 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/dsymbolsem.d CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbolsem.d Auto-merging compiler/src/dmd/dsymbol.h CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbol.h Auto-merging compiler/src/dmd/dsymbol.d CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbol.d Auto-merging compiler/src/dmd/dscope.d Auto-merging compiler/src/dmd/dmangle.d Auto-merging compiler/src/dmd/cppmanglewin.d CONFLICT (content): Merge conflict in compiler/src/dmd/cppmanglewin.d Auto-merging compiler/src/dmd/cppmangle.d CONFLICT (content): Merge conflict in compiler/src/dmd/cppmangle.d Auto-merging compiler/src/dmd/attrib.d Auto-merging compiler/src/dmd/astbase.d Auto-merging compiler/src/dmd/aggregate.d Automatic merge failed; fix conflicts and then commit the result.