From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Sat, 09 Mar 2024 18:01:00 GMT
Subject: Re: [PATCH] sequencer: allow disabling conflict advice
Message-ID: <d83c271b-04c1-f3fc-d922-76f73ac2031a@gmail.com>
In-Reply-To: <3df4790a-7ee1-4c72-a3da-ba8a48d546b8@gmail.com>

Hi Phillip,

Le 2024-03-04 à 05:12, Phillip Wood a écrit :
> Hi Philippe
> 
> On 02/03/2024 16:18, Philippe Blain via GitGitGadget wrote:
> 
> It would also be good to update the "rebase --apply" implementation to respect this advice config to be consistent with "rebase --merge".
Yes, this is a good idea. This would take care of 'git am' at the same time
since both are implemented in builtin/am.c::die_user_resolve.

Thanks,
Philippe.