Re: commiting while the current version is in conflict

On Fri, Oct 17, 2008 at 00:48, Miklos Vajna [off-list ref] 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?


Richard