From: Julia Evans <julia@jvns.ca>
Date: Fri, 09 Oct 2026 13:05:45 GMT
Subject: Re: [PATCH] status: suggest `git merge --continue`, not `git commit`
Message-ID: <2423115b-aed4-4af3-a200-15939824d1b5@app.fastmail.com>
In-Reply-To: <3a716db0-4c40-4407-9237-f83c0dd37ad8@gmail.com>


>> 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
>
> When we use the output of "git show -s --format=reference" when 
> referring to previous commits, so this would be
>
> 367ff69428 (merge: add '--continue' option as a synonym for 'git 
> commit', 2016-12-14)

Thanks, will fix in v2.

>> `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 looks like a sensible improvement. I wonder if we should fix the 
> grammar at the same time so it says
>
>      (use "git merge --continue" to conclude the merge)
>
> rather than
>
>      (use "git merge --continue" to conclude merge)


Makes sense to me, will change that too.