From: Sabyasachi Ruj <ruj.sabya@gmail.com>
To: git@vger.kernel.org
Subject: Confusion about content of conflicted file after : git remove/add
Date: Thu, 24 Jun 2010 10:23:49 +0530 [thread overview]
Message-ID: <AANLkTimqrfeNEmlfHGxWTdLgS7tAMOA66N4nV8b5I8F6@mail.gmail.com> (raw)
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
next reply other threads:[~2010-06-24 4:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-24 4:53 Sabyasachi Ruj [this message]
2010-06-24 6:10 ` Confusion about content of conflicted file after : git remove/add Jeff King
[not found] ` <AANLkTilo0b9aL3oxk0b8eNkBWygwA7xSclTy1MaK8qba@mail.gmail.com>
2010-06-25 5:36 ` Sabyasachi Ruj
2010-06-26 5:58 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTimqrfeNEmlfHGxWTdLgS7tAMOA66N4nV8b5I8F6@mail.gmail.com \
--to=ruj.sabya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).