From: Sabyasachi Ruj <ruj.sabya@gmail.com>
Date: Thu, 24 Jun 2010 04:53:49 GMT
Subject: Confusion about content of conflicted file after : git remove/add
Message-ID: <AANLkTimqrfeNEmlfHGxWTdLgS7tAMOA66N4nV8b5I8F6@mail.gmail.com>

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