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

RE: conflict markers in markdown files

From
rsbecker@nexbridge.com <rsbecker@nexbridge.com>
Date
Oct 28, 2021, 23:25 UTC
Message-ID
<00c601d7cc53$0ce58800$26b09800$@nexbridge.com>
In-Reply-To
<xmqqilxgoicq.fsf@gitster.g>
> -----Original Message-----
> From: Junio C Hamano <gitster@pobox.com>
On October 28, 2021 7:11 PM,
Show 12 quoted lines
> To: Nicholas Bransby-Williams <nbransby@gmail.com>
> Cc: git@vger.kernel.org
> Subject: Re: conflict markers in markdown files
> 
> Nicholas Bransby-Williams <nbransby@gmail.com> writes:
> 
> > 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.
> 
> Those who are editing the file would be able to adjust the attributes
themselves,
> no?
It sounds like we might need an attribute like:
*.md	conflict-marker-size=32,conflict-marker-separator='~'

to stick 32 ~ characters as a separator, if going down that path. I'm not sure how hard this would be, but tooling other systems, like JGit and every client on the planet would be painful.

-Randall
Previous: Junio C HamanoNext: Junio C Hamano
Message 8 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.