git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: conflict markers in markdown files

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 28, 2021, 22:28 UTC
Message-ID
<xmqqilxgpywf.fsf@gitster.g>
In-Reply-To
<CAGyLXMA93qQw_h97bMd14O26hSxn4xn+AzemVyrf6pn53qO3UQ@mail.gmail.com>
Nicholas Bransby-Williams <nbransby@gmail.com> writes:
Show 7 quoted lines
> 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.

Previous: Nicholas Bransby-WilliamsNext: Nicholas Bransby-Williams
Message 5 of 9 in “conflict markers in markdown files”
  1. Nicholas Bransby-WilliamsOct 28, 2021
  2. Philip OakleyOct 28, 2021
  3. Junio C HamanoOct 28, 2021
  4. Nicholas Bransby-WilliamsOct 28, 2021
  5. Junio C HamanoOct 28, 2021
  6. Nicholas Bransby-WilliamsOct 28, 2021
  7. Junio C HamanoOct 28, 2021
  8. rsbecker@nexbridge.comOct 28, 2021
  9. Junio C HamanoOct 29, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.