threads / discuss / 47359

Aborting a merge will delete new files added

Subject: Aborting a merge will delete new files added

## tl;dr

One message between Dec 1, 2017 and Dec 1, 2017.

replies: 0people: 1as markdown or json

Pärham FH· Dec 1, 2017, 11:58 UTC · lore

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

$ 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.