Re: [PATCH v2] merge-ort: turn submodule conflict suggestions into an advice

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Feb 26, 2024, 18:14 UTC
Message-ID: <c00617b0-b673-b52c-db15-278a67370e75@gmail.com>
In-Reply-To: <xmqqh6hvfb6c.fsf@gitster.g>

Hi Junio,

Le 2024-02-26 à 11:22, Junio C Hamano a écrit :

Show 13 quoted lines

> "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
>> From: Philippe Blain <levraiphilippeblain@gmail.com>
>>
>> Add a new advice type 'submoduleMergeConflict' for the error message
>> shown when a non-trivial submodule conflict is encountered, which was
>> added in 4057523a40 (submodule merge: update conflict error message,
>> 2022-08-04). That commit mentions making this message an advice as
>> possible future work. Only show the advice if it is enabled.
> 
> When specifically called out like this, it makes it sound as if this
> one is disabled by default, while everybody else is enabled unless it
> is disabled.

Yes, re-reading myself, this did not come out as I wanted. I'll update the message to read more like "Adjust merge-ort.c::print_submodule_conflict_suggestion to use the advice API" or something like this.

Thanks, Philippe.