Thread (17 messages) 17 messages, 5 authors, 2024-03-25

Re: [PATCH] sequencer: allow disabling conflict advice

From: Philippe Blain <hidden>
Date: 2024-03-09 18:01:02

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help