Re: [RFC/PATCH 1/2] Introduce CHERRY_HEAD

[Bert Wesarg <bert.wesarg@googlemail.com>]

On Wed, Feb 16, 2011 at 00:10, Junio C Hamano <gitster@pobox.com> wrote:
> Bert Wesarg <bert.wesarg@googlemail.com> writes:
>
>>> What happened to the `=======`?  I thought you were copying and pasting
>>> from the said section.
>>
>> I think this is clear enough, else you would need to mention the
>> '|||||||' and conflict_marker_size too.
>
> If so then probably the section this was copied from needs updating?
>

Right, the origin does not mention them too. It also uses just 3
characters, instead of the default 7. I think using '<=>'/'<|=>' as a
visual hint about conflict markers should suffice here plus
referencing the next section. This next section
HOW CONFLICTS ARE PRESENTED does describe both conflict styles but it
doesn't mention the conflict-marker-size option. There are more
references in the documentation where only the RCS style is mentioned.

Anyways, referencing "TRUE MERGE" alone is not enough, it should
mention the following sections too, namely HOW CONFLICTS ARE PRESENTED
and HOW TO RESOLVE CONFLICTS. In German we would do this by '"TRUE
MERGE" ff.' Where 'ff.' is the plural of the abbreviation for
'following'. I don't know how to do that in English.

Also I'm wondering, why the git repo does not set the
conflict-marker-size for its offending files itself. The current
offender would be:

$ git grep -l '^<<<<<<<' Documentation/
Documentation/git-merge-file.txt
Documentation/git-merge.txt
Documentation/user-manual.txt

I may provide a patch in the future, if no one beats me.

Bert