Git: you may want to set your merge.renamelimit variable to at least 1608 and retry the command. » 荒野无灯weblog

Keep It Simple, Stupid.

荒野无灯weblog

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

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

Tagged in :

All Comments (0)
Gravatar image
No Comments