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

merging FETCH_HEAD
Auto-merging compiler/src/dmd/typesem.d
Auto-merging compiler/src/dmd/statementsem.d
Auto-merging compiler/src/dmd/mtype.d
Auto-merging compiler/src/dmd/mars.d
Auto-merging compiler/src/dmd/globals.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/expressionsem.d
Auto-merging compiler/src/dmd/dtemplate.d
Auto-merging compiler/src/dmd/dsymbolsem.d
Auto-merging compiler/src/dmd/dscope.d
Auto-merging compiler/src/dmd/dinterpret.d
Auto-merging compiler/src/dmd/dimport.d
Auto-merging compiler/src/dmd/asttypename.d
Auto-merging compiler/src/build.d
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.