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

Re: error: addinfo_cache failed during merge

From
SBStephen Bash <bash@genarts.com>
Date
Sep 28, 2011, 15:24 UTC
Message-ID
<4364790.33608.1317223450994.JavaMail.root@mail.hq.genarts.com>
In-Reply-To
<26411548.33530.1317221043429.JavaMail.root@mail.hq.genarts.com>
----- Original Message -----
Show 11 quoted lines
> From: "Stephen Bash" <bash@genarts.com>
> To: "git discussion list" <git@vger.kernel.org>
> Sent: Wednesday, September 28, 2011 10:44:03 AM
> Subject: error: addinfo_cache failed during merge
>
> Unfortunately, during the merge, I got a bunch of errors like
> this:
> 
> error: addinfo_cache failed for path 'foo/bar.h'
> 
> So first, is this important?
Well, to my uneducated eye, it looks like the error just left the conflicts in the working copy rather than resolving them.  Running mergetool appears to have cleaned up the problems.

Thanks, Stephen

Previous: Stephen Bash
Message 5 of 5 in “error: addinfo_cache failed during merge”
  1. Stephen BashSep 28, 2011
  2. Junio C HamanoSep 28, 2011
  3. Stephen BashSep 28, 2011
  4. Stephen BashSep 28, 2011
  5. Stephen BashSep 28, 2011

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.