Hi Philip, On Thursday, November 9, 2017 at 9:29:52 PM UTC+1, Philip Oakley wrote: > > I think what you are seeing is that you you have confused different parts > of the display messages. > > I believe Git says: > > You asked Git to cherry pick a commit that has the subject line > "dir02/abc.apk" >
At first I thought the same, but I managed to actually recreate the issue, and the warning line really mentions (different) file name at the end. In my test example, it was: warning: Cannot merge binary files: a.txt.gz (HEAD:a.txt.gz vs. c8fe548... testing:b.txt.gz) ... where "testing" is a commit message, and "b.txt.gz" the actual filename in that commit (opposing "a.txt.gz" inside HEAD). 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
