Re: git mv messed up file mapping if folders contain identical files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx> wrote:
> Bill Okara <billokara@xxxxxxxxx> 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.
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]