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

Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting

From
Ddemerphq <demerphq@gmail.com>
Date
Nov 16, 2010, 10:38 UTC
Message-ID
<AANLkTimAgDDkPowrfF2QNDdLaxHEyOPVgFy=5rafPWoj@mail.gmail.com>
In-Reply-To
<AANLkTinv7XsXNR2MMbaGAUo2=WgL6SEWkuzwGU_7YVn0@mail.gmail.com>
On 16 November 2010 11:26, demerphq <demerphq@gmail.com> wrote:
Show 7 quoted lines
> The error in the subject line is generated if one has a git repo
> checked out to a commit that adds a new file and one does something
> like:
>
> git reset HEAD^
>
> and then a merge operation that involves going forward onto or past HEAD.

In fact there are more operations where this can happen. A failed/aborted rebase. A failed/aborted merge. etc.

All of them, so far in my experience, resulting in this bogus error about overwriting a file with itself.

cheers, Yves

-- 
perl -Mre=debug -e "/just|another|perl|hacker/"
Previous: demerphqNext: Nguyen Thai Ngoc Duy
Message 2 of 8 in “Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting”
  1. demerphqNov 16, 2010
  2. demerphqNov 16, 2010
  3. Nguyen Thai Ngoc DuyNov 16, 2010
  4. Nguyen Thai Ngoc DuyNov 16, 2010
  5. demerphqNov 17, 2010
  6. Ævar Arnfjörð BjarmasonNov 17, 2010
  7. Matthieu MoyNov 17, 2010
  8. Nguyen Thai Ngoc DuyNov 17, 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.