On Thursday, November 9, 2017 at 10:06:50 PM UTC+1, Igor Djordjevic wrote: > > ... Git has "rename detection", where if one file is missing on one side, > but another file appeared one the other side - having different names but > (even just almost) the same content, Git will see that as a rename, and act > accordingly, possibly trying to merge two files, as you experienced. >
Wording might be a bit unfortunate here, as I initially wanted to write something else - could be this is more understandable: Git has "rename detection", where if one file is deleted, but another file appears - having different names but (even just almost) the same content, Git will see that as a rename, and act accordingly, possibly later trying to merge two files, as you experienced. -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
