From: Junio C Hamano <gitster@pobox.com>
To: Nicholas Bransby-Williams <nbransby@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: conflict markers in markdown files
Date: Thu, 28 Oct 2021 15:28:32 -0700 [thread overview]
Message-ID: <xmqqilxgpywf.fsf@gitster.g> (raw)
In-Reply-To: <CAGyLXMA93qQw_h97bMd14O26hSxn4xn+AzemVyrf6pn53qO3UQ@mail.gmail.com> (Nicholas Bransby-Williams's message of "Thu, 28 Oct 2021 21:33:45 +0100")
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.
next prev parent reply other threads:[~2021-10-28 22:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 14:00 conflict markers in markdown files Nicholas Bransby-Williams
2021-10-28 15:38 ` Philip Oakley
2021-10-28 19:54 ` Junio C Hamano
2021-10-28 20:33 ` Nicholas Bransby-Williams
2021-10-28 22:28 ` Junio C Hamano [this message]
2021-10-28 22:49 ` Nicholas Bransby-Williams
2021-10-28 23:11 ` Junio C Hamano
2021-10-28 23:25 ` rsbecker
2021-10-29 5:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqilxgpywf.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nbransby@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).