From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 09 Oct 2026 18:39:34 GMT
Subject: Re: [PATCH v3] status: suggest `git merge --continue`, not `git commit`
Message-ID: <xmqqecdypvkp.fsf@gitster.g>
In-Reply-To: <3e43682f-6dbf-49fc-91e4-2019f3c13f48@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

> Hi Julia
>
> On 09/10/2026 16:13, 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. 367ff69428
>> (merge: add '--continue' option as a synonym for 'git commit', 2016-12-14)
>> says that `git merge --continue` is intended to be a synonym for
>> `git commit`, and the `git merge` man page already suggests to use
>> `git merge --continue`.
>
> This version looks good to me, thanks for working on it
>
> Phillip

Will apply with your Acked-by: and mark the topic for 'next'.

Thanks.