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 ..." to mark resolution)
both modified: dir01/test.apk
There is a dir01/test.apk file locally,
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
>
On Thursday, November 9, 2017 at 10:06:50 PM UTC+1, Igor Djordjevic wrote:
... 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,
On Thursday, November 9, 2017 at 10:06:50 PM UTC+1, Igor Djordjevic wrote:
>
> ... 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
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
Hi,
On Thursday, November 9, 2017 at 9:42:06 AM UTC+1, euni...@gmail.com 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
