Auto-merging master/.config

CONFLICT (content): Merge conflict in master/.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 99999Code language: CSS (css)