From: [email protected]
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
conflict?
--
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"
When Git trys to merge in that commit (between HEAD and 382c6ba), Git finds
that the file "dir01/test.apk" is binary and that Git cannot merge that file.
So..
do check the current HEAD structure to see if it has dir01/test.apk, and then
check 382c6ba.
Check for a similar file name within the two worktrees just in case move
detection has decided that the file may have been moved and is thus trying to
merge to a file elsewhere, and even then it doesn't do binary merges out of the
tin (do you have a mergetool set for .apk files? maybe it is utf-16, and thus
'binary'..?)
--
Philip
--
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.
