fetching https://github.com/nordlow/dmd.git diagnose-padding (attempt: 1/3) From https://github.com/nordlow/dmd * branch diagnose-padding -> FETCH_HEAD merging FETCH_HEAD Auto-merging compiler/src/dmd/mars.d Auto-merging compiler/src/dmd/globals.h Auto-merging compiler/src/dmd/globals.d Auto-merging compiler/src/dmd/frontend.h CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h Auto-merging compiler/src/dmd/declaration.d Auto-merging compiler/src/dmd/attrib.d Auto-merging compiler/src/dmd/aggregate.d Automatic merge failed; fix conflicts and then commit the result.