Re: [PATCH v2 03/10] sequencer: be more careful with external merge

> On Mon, Jul 13, 2026 at 02:17:20PM +0100, Phillip Wood wrote:
>> If an external merge strategy cannot merge (for example because it
>> would overwrite an untracked file) it exits with a non-zero exit
>> code other than 1. This should be treated differently to a merge
>>
> s/to/from/, i think?

>> with conflicts
> 
>> which is signalled by an exit code of 1
>>
> parenthesize, and add comma?
> 
>> because as
>> the merge failed
>>
> (maybe add comma? here it becomes muddy ...)
> 
>> we need to reschedule the last pick. The caller
>> expects us to return -1 in this case. Also reschedule without trying
>> to merge if the commit message cannot be written
>>
> add comma?
> 
>> as that prevents us
>> from successfully picking the commit.
> 
> i know that most commas (and parens (or em-dashes)) are optional in 
> english, but they _really_ help parsing complex sentences, because they 
> reduce the amount of "read-ahead" required.
> i'm stopping at this commit, but subsequent ones could also use the 
> treatment. i trust that you don't actually need detailed suggestions.