From: "Julia Evans" <julia@jvns.ca>
To: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>,
git@vger.kernel.org, "Julia Evans" <gitgitgadget@gmail.com>
Cc: "D. Ben Knoble" <ben.knoble@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>
Subject: Re: [PATCH v2] status: suggest `git merge --continue`, not `git commit`
Date: Fri, 09 Oct 2026 11:13:36 -0400 [thread overview]
Message-ID: <e3227098-5f12-48dc-8c21-8d2388b1a8eb@app.fastmail.com> (raw)
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.
next prev parent reply other threads:[~2026-10-09 15:13 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 [this message]
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
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=e3227098-5f12-48dc-8c21-8d2388b1a8eb@app.fastmail.com \
--to=julia@jvns.ca \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=kristofferhaugsbakk@fastmail.com \
--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