From: Phillip Wood <phillip.wood123@gmail.com>
Date: Wed, 15 Jul 2026 09:42:55 GMT
Subject: Re: [PATCH v2 03/10] sequencer: be more careful with external merge
Message-ID: <6cdccc2b-c0b4-497f-8408-a18bd0981505@gmail.com>
In-Reply-To: <58c488c1-139a-4b56-9f80-2492b081f659@gmail.com>

On 15/07/2026 10:35, Phillip Wood wrote:
> Hi Oswald
> 
> On 13/07/2026 15:01, Oswald Buddenhagen wrote:
>> 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?
> 
> Both are valid - the internet tells be "different to" is more common it 

sigh s/be/me/

Phillip

> British English, whereas "different from" is more common in American 
> English. I guess for an international audience "from" would be the 
> better choice.
> 
>>> 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.
> 
> I've added a few more commas to later commits, but concrete suggestions 
> are always welcome.
> 
> Thanks
> 
> Phillip
>