From: Philip Oakley Date: Thu, 28 Oct 2021 15:38:52 GMT Subject: Re: conflict markers in markdown files Message-ID: <9561c0de-fb97-093b-4615-6d6d7d595d51@iee.email> In-Reply-To: On 28/10/2021 15:00, Nicholas Bransby-Williams wrote: > Isn't it quite unfortunate that markdown chose setext-style headers by > “underlining” with equal signs (=) meaning if a header is 7 characters > long it's going to clash with the git conflicts markers (example > below). > > Would it make sense to add an option to merge-file so merge tools can > specify a custom marker that is statistically much less likely to > clash with the kinds of text files that are typically stored in git > repositories? > > cat ./ours.md > A Second Level Header > --------------------- > Ours > ======= > Its ours > The quick brown fox jumped over the lazy > dog's back. > > cat ./base.md > A Second Level Header > --------------------- > The quick brown fox jumped over the lazy > dog's back. > > cat ./theirs.md > A Second Level Header > --------------------- > Theirs > ======= > Its theirs > The quick brown fox jumped over the lazy > dog's back. > > git merge-file -p ./ours.md ./base.md ./theirs.md > A Second Level Header > --------------------- > <<<<<<< ./ours.md > Ours > ======= > Its ours > ======= > Theirs > ======= > Its theirs >>>>>>>> ./theirs.md In a similar vein, the above `>>>>>>> ./theirs.md` is being formatted as repeated side bars in Thunderbird. But that's someone else's problem ;-) > The quick brown fox jumped over the lazy > dog's back.