Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Julia Evans via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org,  "D. Ben Knoble" <ben.knoble@gmail.com>,
	 Julia Evans <julia@jvns.ca>
Subject: Re: [PATCH v3] status: suggest `git merge --continue`, not `git commit`
Date: Fri, 09 Oct 2026 11:39:34 -0700	[thread overview]
Message-ID: <xmqqecdypvkp.fsf@gitster.g> (raw)
In-Reply-To: <3e43682f-6dbf-49fc-91e4-2019f3c13f48@gmail.com> (Phillip Wood's message of "Fri, 9 Oct 2026 16:18:38 +0100")

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.

      reply	other threads:[~2026-10-09 18:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-06 13:02 [PATCH] status: suggest `git merge --continue`, not `git commit` Julia Evans via GitGitGadget
2026-10-06 15:31 ` Phillip Wood
2026-10-09 13:05   ` Julia Evans
2026-10-06 18:20 ` Junio C Hamano
2026-10-09 13:09   ` Julia Evans
2026-10-09 13:11 ` [PATCH v2] " Julia Evans via GitGitGadget
2026-10-09 14:28   ` Kristoffer Haugsbakk
2026-10-09 15:13     ` Julia Evans
2026-10-09 15:13 ` [PATCH v3] " Julia Evans via GitGitGadget
2026-10-09 15:18   ` Phillip Wood
2026-10-09 18:39     ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqecdypvkp.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=julia@jvns.ca \
    --cc=phillip.wood123@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox