Leam Hall <leamh...@gmail.com> writes: Hi Leam,
> Before I go off and make changes, can you help me understand this > warning? I get the concept, but haven't seen this one before. > > warning: inexact rename detection was skipped due to too many files. > warning: you may want to set your merge.renamelimit variable to at > least 1232 and retry the command. Automatic merge failed; fix > conflicts and then commit the result. When you merge, git tries to detect file renamings so that a file's history isn't broken by renames. However, that's quite some expensive process right now, so there is this limit of how hard and long git tries. FWIW, I've increased it quite a bit because a having a renamed file show up as new is more annoying in the long run than having to wait some seconds more during each merge but YMMV. I've heared rumours that this rename/copy detection would be optimized at some point in time though I have no idea if that has happened already. Maybe yes, at least I haven't seen the rename detection (which usually had some counting x/VeryBigNumber output) recently using git 2.31.1. Or at least, I can't remember seeing it. Bye, Tassilo -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/87eefb23l8.fsf%40gnu.org.
