Re: [PATCH 4/4] checkout: cleanup --conflict=<style> parsing

From: phillip.wood123@gmail.com <phillip.wood123@gmail.com>
Date: Mar 11, 2024, 14:36 UTC
Message-ID: <f0c88900-63d3-46ed-9cb8-fc7c3fc07c28@gmail.com>
In-Reply-To: <xmqq1q8khf8t.fsf@gitster.g>

Hi Junio

On 08/03/2024 16:15, Junio C Hamano wrote:

Show 5 quoted lines

> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
> parse_conflict_style_name() that takes a name and returns
> conflict_style enumeration constant would not risk such a confusion,
> I guess.

Can I just check if you mean that we should convert XDL_MERGE_DIFF3 and friends to be an enum, or are you happy to leave them as pre-processor constants and have parse_conflict_style_name() return an int? I don't mind changing them to be an enum but I'm not sure it buys any type safety as C is happy to implicitly convert enums and integers. It would also raise the question of whether we should be converting the merge flavor and diff algorithm constants to enums as well.

Thanks

Phillip