Git: you may want to set your merge.renamelimit variable to at least 1608 and retry the command.

1 min readMar 19, 2017

2017–03–17 01:43:04
Git
荒野无灯

Auto-merging trunk/.config
CONFLICT (content): Merge conflict in trunk/.config
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 1608 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

解决办法：

git config merge.renameLimit 999999

Git: you may want to set your merge.renamelimit variable to at least 1608 and retry the command.

Written by 荒野无灯