From: Phillip Wood <phillip.wood123@gmail.com>
Date: Tue, 12 Mar 2024 15:50:28 GMT
Subject: Re: [PATCH 4/4] checkout: cleanup --conflict=<style> parsing
Message-ID: <21c3904b-b533-4c6c-9f62-ca75c084ffca@gmail.com>
In-Reply-To: <xmqqcys0sm22.fsf@gitster.g>

On 11/03/2024 17:41, Junio C Hamano wrote:
> phillip.wood123@gmail.com writes:
> 
>> On 08/03/2024 16:15, Junio C Hamano wrote:
>>> "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?
> 
> The latter.  I was only wondering what the good name for the new
> function was and did not mean to imply that we want conversions from
> C preprocessor macros to enums.

Thanks

Phillip