Hi, On Thursday, November 9, 2017 at 9:42:06 AM UTC+1, [email protected] wrote: > > Could a conflict occur even though the file names are different? >
Yes. dir01/test.apk and dir02/abc.apk have different names. Why is there a > conflict? > What Philip already mentioned - 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. Git says - you modified file "dir01/test.apk", other side renamed file "dir01/test.apk" to "dir02/abc.apk" and modified it, too -- thus Git still seeing it as the same file and trying to merge, and failing as these are binary files. Other side might have actually deleted "dir01/test.apk" and created new "dir02/abc.apk" which just happened to be almost the same as previously deleted "dir01/test.apk", Git will still see that a simple rename of the old file (plus the modification). Note that if other side`s file, "dir02/abc.apk", wasn`t modified but _exactly the same_ as previous "dir01/test.apk" file (regarding file content), your "dir01/test.apk" file would have just been renamed to "dir02/abc.apk" as a direct consequence of the cherry-pick you attempted -- as even if not actually, contextually that`s exactly what happened on the other side :) Regards, Buga -- 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.
