Re: conflict markers in markdown files

From: Nicholas Bransby-Williams <nbransby@gmail.com>
Date: Oct 28, 2021, 22:49 UTC
Message-ID: <CAGyLXMBe2qj8mT+gA2skQr=+bteV9E0nKZ=u-5akCQtTU7AfKA@mail.gmail.com>
In-Reply-To: <xmqqilxgpywf.fsf@gitster.g>

Thanks, I didn't miss that.

I have no control over the content in the file so I don't know what an appropriate number is.

Although I guess an unfeasible large one would make a clash highly unlikely.

On Thu, 28 Oct 2021 at 23:28, Junio C Hamano <gitster@pobox.com> wrote:

Show 15 quoted lines

>
> Nicholas Bransby-Williams <nbransby@gmail.com> 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.