From: Julia Evans <julia@jvns.ca>
Date: Fri, 09 Oct 2026 15:13:36 GMT
Subject: Re: [PATCH v2] status: suggest `git merge --continue`, not `git commit`
Message-ID: <e3227098-5f12-48dc-8c21-8d2388b1a8eb@app.fastmail.com>
In-Reply-To: <3e26cf00-ce81-486a-a6a6-720d22b8f118@app.fastmail.com>

> On Fri, Oct 9, 2026, at 15:11, Julia Evans via GitGitGadget wrote:
>> From: Julia Evans <julia@jvns.ca>
>>
>> During a merge conflict, we suggest using --continue to continue the
>> merge for rebase, revert, and cherry-pick.
>>
>> Change the `git merge` advice to be consistent.
>> Commit 367ff694281ce569edd8f6e444fc770f92f5d215 says that
>>[snip]
>> Signed-off-by: Julia Evans <julia@jvns.ca>
>>[snip]
>>     Changes in v2:
>>
>>      * Use git show -s --format=reference to format the reference in the
>>        commit message (thanks to Phillip)
>
> But this isn’t changed?

Oops, I was so sure that I'd changed it but obviously not.
Sent a v3 with it changed.