I ran into this error today will trying to merge a large refactor.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renameLimit variable to at least 1264 and retry the command
Here is how you set and unset that rename limit
git config merge.renameLimit 999999 git config --unset merge.renameLimit