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

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 26, 2024, 16:22 UTC
Message-ID: <xmqqh6hvfb6c.fsf@gitster.g>
In-Reply-To: <pull.1661.v2.git.git.1708954048301.gitgitgadget@gmail.com>

"Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 7 quoted lines

> 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.

> Update the tests as the expected message now appears on stderr instead
> of stdout.

Makes sense.

Thanks.