fetching https://github.com/nordlow/dmd.git add-traits-hasAliasing (attempt: 1/3)
From https://github.com/nordlow/dmd
 * branch                  add-traits-hasAliasing -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (implicit dir rename): Cannot map more than one path to compiler/test/fail_compilation/traits_hasAliasing.d; implicit directory renames tried to put these paths there: test/compilable/traits_hasAliasing.d, test/fail_compilation/traits_hasAliasing.d
Auto-merging compiler/src/dmd/traits.d
CONFLICT (content): Merge conflict in compiler/src/dmd/traits.d
Auto-merging compiler/src/dmd/mtype.d
CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.d
Auto-merging compiler/src/dmd/id.d
Auto-merging compiler/src/dmd/frontend.h
Automatic merge failed; fix conflicts and then commit the result.