On Sun, May 15, 2011 at 12:56 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Nguyen Thai Ngoc Duy <pclouds@xxxxxxxxx> writes: > >> On Sat, May 14, 2011 at 11:26 PM, Jens Lehmann <Jens.Lehmann@xxxxxx> wrote: >>> Commands like "git status", "git diff" and "git fetch" would fail when the >>> .gitmodules file contained merge conflicts because ... >> >> Side note. .gitattributes and .gitignore likely suffer the same. >> Perhaps the unmerged check in this patch can be generalized for reuse. > > I am somewhat skeptical about that statement. ÂThese files are designed to > be one-entry-per-line so that useful information in the non-conflicted > parts in a conflicted file (which should be majority) can still be used. > Only the .gitmodules is an oddball. True for .gitignore. A line in .gitattributes is more complex, it's easier to break the parser with conflict markers. Anyway unmerged entries should not be used until they're cleaned up, or can be used with a big fat warning. -- Duy -- 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