From: Stephen Bash <bash@genarts.com>
Date: Wed, 28 Sep 2011 15:24:11 GMT
Subject: Re: error: addinfo_cache failed during merge
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 -----
> 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