Confusion about content of conflicted file after : git remove/add

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

 



I have asked the question in detail in Stack Overflow.
http://stackoverflow.com/questions/3100032/git-rename-delete-confusion
Can anyone here explain that situation. Please also read the comments
I wrote there.

I am totally baffled and can't predict what will be the content of a
file after "git rm and git add" in branch and "git mv" in another
branch.

--
Sabyasachi
--
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]