Subject: Re: conflict markers in markdown files

From: Junio C Hamano <[email-masked]>
Date: Thu, 28 Oct 2021 15:28:32 -0700

Nicholas Bransby-Williams <[email-masked]> writes:

> I guess using such a long marker makes it less likely but there no
> reason you wouldn't have a 32 character long title in markdown
>
> Example.... :)
>
> An important heading in markdown
> ================================

You probably missed the part that I said .gitattributes is under
control of those who are editing the files the entry refers to.  So
when you edit the file and add such a line, you can easily edit the
attributes file and pick an appropriate number.