----- Original Message ----- > From: "Stephen Bash" <bash@xxxxxxxxxxx> > To: "git discussion list" <git@xxxxxxxxxxxxxxx> > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html