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
>
From: eunida...@gmail.com
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 ..." to mark resolution)
both modified: dir01/test.apk
