Richard Hartmann <richih.mailinglist@xxxxxxxxx> wrote: > On Fri, Oct 17, 2008 at 00:48, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > > > Not sure, but in general blocking conflict markers by default would be a > > bad idea IMHO, several markup language (asciidoc, for example) makes use > > of the >>>, === and such character sequences. > > Doesn't git keep metadata about conflicts, as well? Yes, in the index. But it erases it when you stage the file with "git add". Go look at my prior message about how "git commit -a" is staging the files prior to commit. That makes git commit think everything has been resolved, because you've told git, everything is resolved. -- Shawn. -- 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
