Re: conflict markers in markdown files

2 messages, 2 authors, 2021-10-28 · open the first message on its own page

Re: conflict markers in markdown files

From: Junio C Hamano <hidden>
Date: 2021-10-28 23:11:24

Nicholas Bransby-Williams [off-list ref] 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?

RE: conflict markers in markdown files

From: <hidden>
Date: 2021-10-28 23:25:17

-----Original Message-----
From: Junio C Hamano <redacted>
On October 28, 2021 7:11 PM, 
To: Nicholas Bransby-Williams <redacted>
Cc: git@vger.kernel.org
Subject: Re: conflict markers in markdown files

Nicholas Bransby-Williams [off-list ref] writes:
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help