From: Bill Okara <billokara@gmail.com>
Date: Wed, 24 Feb 2016 23:51:43 GMT
Subject: Re: git mv messed up file mapping if folders contain identical files
Message-ID: <CADsr5c8akqt7tsgptuDqCyt2JW8ie9js5eFt7oxXxDxtGMLJFA@mail.gmail.com>
In-Reply-To: <xmqqwpptr83a.fsf@gitster.mtv.corp.google.com>

it actually does matter in the following scenario:

1) master branch has identical content.txt files in the folder structure
2) do the git mv in a new branch
3) master branch updated the context.txt to contain new data (more
relevant to the containing folder)
4) new branch need to merge the updates from master

after the merge, demo/content.txt in the new path would contain
updates from dev/content.txt from master...

On Wed, Feb 24, 2016 at 4:39 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Bill Okara <billokara@gmail.com> writes:
>
>> just want to see if this is a bug, user error (on my end), or??
>
> Not a bug, not a user error, just "it does not matter", I think.
>
>