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

merging FETCH_HEAD
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4438 and retry the command.
CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in 9da2c3e70705e29d5b680c3a5cd324e1b9870f10. Version 9da2c3e70705e29d5b680c3a5cd324e1b9870f10 of src/dmd/traits.d left in tree.
Auto-merging compiler/test/fail_compilation/trait_loc_err.d
Auto-merging compiler/test/compilable/traits.d
Automatic merge failed; fix conflicts and then commit the result.