From: <rsbecker@nexbridge.com>
To: "'Junio C Hamano'" <gitster@pobox.com>,
"'Nicholas Bransby-Williams'" <nbransby@gmail.com>
Cc: <git@vger.kernel.org>
Subject: RE: conflict markers in markdown files
Date: Thu, 28 Oct 2021 19:25:04 -0400 [thread overview]
Message-ID: <00c601d7cc53$0ce58800$26b09800$@nexbridge.com> (raw)
In-Reply-To: <xmqqilxgoicq.fsf@gitster.g>
> -----Original Message-----
> From: Junio C Hamano <gitster@pobox.com>
On October 28, 2021 7:11 PM,
> 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
next prev parent reply other threads:[~2021-10-28 23:25 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
2021-10-28 22:49 ` Nicholas Bransby-Williams
2021-10-28 23:11 ` Junio C Hamano
2021-10-28 23:25 ` rsbecker [this message]
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='00c601d7cc53$0ce58800$26b09800$@nexbridge.com' \
--to=rsbecker@nexbridge.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.