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

Aborting a merge will delete new files added

From
PFPärham FH <parhamfh@kth.se>
Date
Dec 1, 2017, 11:58 UTC
Message-ID
<CAM-FauOP_FG=N=npVhuKdiYATDAGxeP+q+qud3-X3g99=g_mBQ@mail.gmail.com>
Hi!

While sorting out a merge conflict I accidentally added an untracked folder to the index. Later I decided to abort the merge with `git merge --abort` and I expected it to unstage the untracked file but it instead removed it. This was not what I expected.

Cheers, Pärham

Message 1 of 1 in “Aborting a merge will delete new files added”
  1. Pärham FHDec 1, 2017

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.