From: Stephen Bash <bash@genarts.com>
To: git discussion list <git@vger.kernel.org>
Subject: Re: error: addinfo_cache failed during merge
Date: Wed, 28 Sep 2011 11:24:11 -0400 (EDT) [thread overview]
Message-ID: <4364790.33608.1317223450994.JavaMail.root@mail.hq.genarts.com> (raw)
In-Reply-To: <26411548.33530.1317221043429.JavaMail.root@mail.hq.genarts.com>
----- Original Message -----
> 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
prev parent reply other threads:[~2011-09-28 15:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <8172019.33448.1317219409234.JavaMail.root@mail.hq.genarts.com>
2011-09-28 14:44 ` error: addinfo_cache failed during merge Stephen Bash
2011-09-28 15:24 ` Junio C Hamano
2011-09-28 15:33 ` Stephen Bash
2011-09-28 15:44 ` Stephen Bash
2011-09-28 15:24 ` Stephen Bash [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4364790.33608.1317223450994.JavaMail.root@mail.hq.genarts.com \
--to=bash@genarts.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).