fetching https://github.com/Geod24/dmd.git ctor-visibility (attempt: 1/3)
From https://github.com/Geod24/dmd
 * branch            ctor-visibility -> 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 3665 and retry the command.
CONFLICT (modify/delete): test/compilable/extra-files/json.out deleted in HEAD and modified in 70dea3ce80e905a5aa6e84b995953a6e85cda3bf. Version 70dea3ce80e905a5aa6e84b995953a6e85cda3bf of test/compilable/extra-files/json.out left in tree.
CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in 70dea3ce80e905a5aa6e84b995953a6e85cda3bf. Version 70dea3ce80e905a5aa6e84b995953a6e85cda3bf of src/dmd/traits.d left in tree.
CONFLICT (modify/delete): src/dmd/func.d deleted in HEAD and modified in 70dea3ce80e905a5aa6e84b995953a6e85cda3bf. Version 70dea3ce80e905a5aa6e84b995953a6e85cda3bf of src/dmd/func.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 70dea3ce80e905a5aa6e84b995953a6e85cda3bf. Version 70dea3ce80e905a5aa6e84b995953a6e85cda3bf of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in 70dea3ce80e905a5aa6e84b995953a6e85cda3bf. Version 70dea3ce80e905a5aa6e84b995953a6e85cda3bf of src/dmd/dsymbol.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.