git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Sabyasachi Ruj <ruj.sabya@gmail.com>
Date
Jun 24, 2010, 04:53 UTC
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

Next: Jeff King
Message 1 of 4 in “Confusion about content of conflicted file after : git remove/add”
  1. Sabyasachi RujJun 24, 2010
  2. Jeff KingJun 24, 2010
  3. Sabyasachi RujJun 25, 2010
  4. Jeff KingJun 26, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.