Hi guys.

Could a conflict occur even though the file names are different?

The Conflict occurs when cherry-picking a particular commit.

Status like below:

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   dir01/test.apk

There is a dir01/test.apk file locally, but there is no file on the remote.

When a conflict occurs, a warning is shown below.
warning: Cannot merge binary files: dir01/test.apk (HEAD:dir01/test.apk vs. 
382c6ba... This is commit subject:dir02/abc.apk)

dir01/test.apk and dir02/abc.apk have different names. Why is there a 

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.

Reply via email to