From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Sat, 16 Mar 2024 20:33:03 GMT
Subject: Re: [PATCH v2 0/2] Allow disabling advice shown after merge conflicts
Message-ID: <f773d6d8-ad1b-dec7-1ba1-741af497bccc@gmail.com>
In-Reply-To: <4e1abd12-d73f-41b2-a334-036be9093485@gmail.com>

Hi Rubén,

Le 2024-03-11 à 16:58, Rubén Justo a écrit :
> On Sun, Mar 10, 2024 at 07:50:59PM +0000, Philippe Blain via GitGitGadget wrote:
> 
> 
>>        ## advice.h ##
>>       @@ advice.h: enum advice_type {
>>      - 	ADVICE_RESOLVE_CONFLICT,
>>      - 	ADVICE_RM_HINTS,
>>      - 	ADVICE_SEQUENCER_IN_USE,
>>      -+	ADVICE_SEQUENCER_CONFLICT,
>>      - 	ADVICE_SET_UPSTREAM_FAILURE,
>>      - 	ADVICE_SKIPPED_CHERRY_PICKS,
>>      - 	ADVICE_STATUS_AHEAD_BEHIND_WARNING,
>>      + 	ADVICE_IGNORED_HOOK,
>>      + 	ADVICE_IMPLICIT_IDENTITY,
>>      + 	ADVICE_NESTED_TAG,
>>      ++	ADVICE_MERGE_CONFLICT,
>>      + 	ADVICE_OBJECT_NAME_WARNING,
>>      + 	ADVICE_PUSH_ALREADY_EXISTS,
>>      + 	ADVICE_PUSH_FETCH_FIRST,
> 
> Here, I assume you're trying to place the new name correctly too.
> However, I see that it's in the wrong place.  It initially caught my
> attention, but then I realize that the list is not sorted.  So it's
> understandable.
> 
> Maybe you want to sort the list as a preparatory patch in this series
> and so we'll avoid this kind of mistakes.
> 
> Of course, this does not deserve a reroll.  We can do it in a future
> series when the dust settles.

I fixed this to put it in the correct order.

Thanks,

Philippe.