Thread (3 messages) 3 messages, 2 authors, 2016-06-15

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

From: Bill Okara <hidden>
Date: 2016-06-15 23:08:26

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 [off-list ref] wrote:
Bill Okara [off-list ref] writes:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help