Skip to content

status: suggest git merge --continue, not git commit - #2249

Open
jvns wants to merge 1 commit into
gitgitgadget:masterfrom
jvns:advice-merge
Open

jvns wants to merge 1 commit into
gitgitgadget:masterfrom
jvns:advice-merge

Conversation

@jvns

@jvns jvns commented Oct 6, 2026 •

Copy link
Copy Markdown

Changes in v2:

  • Use git show -s --format=reference to format the reference in the commit message (thanks to Phillip)
  • change to "conclude the merge" (thanks to Phillip)

Changes in v3:

  • Actually format the reference correctly (oops)

cc: D. Ben Knoble ben.knoble@gmail.com
cc: Phillip Wood phillip.wood123@gmail.com
cc: "Kristoffer Haugsbakk" kristofferhaugsbakk@fastmail.com

@jvns
jvns force-pushed the advice-merge branch 2 times, most recently from a961b93 to 551b0e7 Compare October 6, 2026 13:00
@jvns jvns changed the title advice: suggest git merge --continue, not git commit status: suggest git merge --continue, not git commit Oct 6, 2026
@jvns

jvns commented Oct 6, 2026

Copy link
Copy Markdown
Author

/submit

@gitgitgadget

gitgitgadget Bot commented Oct 6, 2026

Copy link
Copy Markdown

Submitted as pull.2249.git.1791291762665.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2249/jvns/advice-merge-v1

To fetch this version to local tag pr-2249/jvns/advice-merge-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2249/jvns/advice-merge-v1

@gitgitgadget

gitgitgadget Bot commented Oct 6, 2026

Copy link
Copy Markdown

Phillip Wood wrote on the Git mailing list (how to reply to this email):

Hi Julia

On 06/10/2026 14:02, 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

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)

> `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)

Thanks

Phillip

> Signed-off-by: Julia Evans <julia@jvns.ca>
> ---
>      status: suggest git merge --continue, not git commit
>      >      We discussed making this consistent in another thread:
>      https://lore.kernel.org/git/623cdf71-8076-4967-aff1-3ebeb57d1e3a@app.fastmail.com/T/#m4bdcb555cbdff4132fb1a678594f26b598e0b38f
>      >      From some research:
>      >       * git merge --continue was introduced in 367ff694281c in Dec 2016. It
>         says that git merge --continue is intended to be a synonym for git
>         commit. (thread here:
>         https://lore.kernel.org/git/20161214083757.26412-1-judge.packham@gmail.com/)
>       * This line of the advice was last touched in July 2016, before git
>         merge --continue was introduced.
>      >      So I don't see any obvious reason not to change the advice.
>      >      Translations will need to be updated, I still don't know how that
>      process works. Updating the translations should be straightforward since
>      it's just a change in the command.
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2249%2Fjvns%2Fadvice-merge-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2249/jvns/advice-merge-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/2249
> >   t/t7060-wtstatus.sh    | 8 ++++----
>   t/t7512-status-help.sh | 4 ++--
>   wt-status.c            | 4 ++--
>   3 files changed, 8 insertions(+), 8 deletions(-)
> > diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
> index 942ddbbf0e..a9b435b5e3 100755
> --- a/t/t7060-wtstatus.sh
> +++ b/t/t7060-wtstatus.sh
> @@ -37,7 +37,7 @@ test_expect_success 'M/D conflict does not segfault' '
>   	cat >expect <<EOF &&
>   On branch side
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -141,7 +141,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th
>   	cat >expected <<\EOF &&
>   On branch main
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -174,7 +174,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted)
>   	cat >expected <<\EOF &&
>   On branch conflict_second
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -198,7 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' '
>   	cat >expected <<\EOF &&
>   On branch conflict_second
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Changes to be committed:
> diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
> index aca4b6d332..776a0dd5b8 100755
> --- a/t/t7512-status-help.sh
> +++ b/t/t7512-status-help.sh
> @@ -31,7 +31,7 @@ test_expect_success 'status when conflicts unresolved' '
>   	cat >expected <<\EOF &&
>   On branch conflicts
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -53,7 +53,7 @@ test_expect_success 'status when conflicts resolved before commit' '
>   	cat >expected <<\EOF &&
>   On branch conflicts
>   All conflicts fixed but you are still merging.
> -  (use "git commit" to conclude merge)
> +  (use "git merge --continue" to conclude merge)
>   >   Changes to be committed:
>   	modified:   main.txt
> diff --git a/wt-status.c b/wt-status.c
> index 57772c7501..f7b0dc29d5 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1273,7 +1273,7 @@ static void show_merge_in_progress(struct wt_status *s,
>   		status_printf_ln(s, color, _("You have unmerged paths."));
>   		if (s->hints) {
>   			status_printf_ln(s, color,
> -					 _("  (fix conflicts and run \"git commit\")"));
> +					 _("  (fix conflicts and run \"git merge --continue\")"));
>   			status_printf_ln(s, color,
>   					 _("  (use \"git merge --abort\" to abort the merge)"));
>   		}
> @@ -1282,7 +1282,7 @@ static void show_merge_in_progress(struct wt_status *s,
>   			_("All conflicts fixed but you are still merging."));
>   		if (s->hints)
>   			status_printf_ln(s, color,
> -				_("  (use \"git commit\" to conclude merge)"));
> +				_("  (use \"git merge --continue\" to conclude merge)"));
>   	}
>   	wt_longstatus_print_trailer(s);
>   }
> > base-commit: 5a7d1e8045ce66c908f62598e26cbb8df7b39a90

@gitgitgadget

gitgitgadget Bot commented Oct 6, 2026

Copy link
Copy Markdown

User Phillip Wood <phillip.wood123@gmail.com> has been added to the cc: list.

@gitgitgadget

gitgitgadget Bot commented Oct 6, 2026

Copy link
Copy Markdown

Junio C Hamano wrote on the Git mailing list (how to reply to this email):

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:

[Administrivia]

As you have

    cc: D. Ben Knoble" ben.knoble@gmail.com

at the end of your pull request that you gave to GitGitGadget, you
ended up with a bogus Cc: address that reads

    "D. Ben Knoble <ben.knoble"@gmail.com>

you may want to help improving GGG by raising an issue to reject (or
ignore) such a malformed address.

[end of administrivia]

> diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
> index 942ddbbf0e..a9b435b5e3 100755
> --- a/t/t7060-wtstatus.sh
> +++ b/t/t7060-wtstatus.sh
> @@ -37,7 +37,7 @@ test_expect_success 'M/D conflict does not segfault' '
>  	cat >expect <<EOF &&
>  On branch side
>  You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>    (use "git merge --abort" to abort the merge)

This message comes from show_merge_in_progress(), which is called
only when the code is convinced that it is seeing an unmerged
index due to a conflicted git merge.  We can therefore make this
message as merge-specific as we want.  The suggestion to use
'git merge --abort' already does this.

> diff --git a/wt-status.c b/wt-status.c
> index 57772c7501..f7b0dc29d5 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1273,7 +1273,7 @@ static void show_merge_in_progress(struct wt_status *s,
>  		status_printf_ln(s, color, _("You have unmerged paths."));
>  		if (s->hints) {
>  			status_printf_ln(s, color,
> -					 _("  (fix conflicts and run \"git commit\")"));
> +					 _("  (fix conflicts and run \"git merge --continue\")"));
>  			status_printf_ln(s, color,
>  					 _("  (use \"git merge --abort\" to abort the merge)"));
>  		}
> @@ -1282,7 +1282,7 @@ static void show_merge_in_progress(struct wt_status *s,
>  			_("All conflicts fixed but you are still merging."));
>  		if (s->hints)
>  			status_printf_ln(s, color,
> -				_("  (use \"git commit\" to conclude merge)"));
> +				_("  (use \"git merge --continue\" to conclude merge)"));
>  	}
>  	wt_longstatus_print_trailer(s);
>  }

We could tighten "You have unmerged paths." even further to indicate
that these paths came from a conflicted 'git merge'.  In the same
file, show_cherry_pick_in_progress() and show_revert_in_progress()
already provide instructions very specific to these commands.  Since
the message for 'git merge' is the oldest, it is not surprising that
we did not update it when 'git merge --continue', the instructions
for cherry-pick and revert, or 'git merge --abort' instruction were
added to the system.  This commit moves us belatedly in the right
direction, and as always, it is better late than never.

The changes look good.  Thanks.

@gitgitgadget

gitgitgadget Bot commented Oct 7, 2026

Copy link
Copy Markdown

This branch is now known as je/status-merge-specific-help.

@gitgitgadget

gitgitgadget Bot commented Oct 7, 2026

Copy link
Copy Markdown

This patch series was integrated into seen via git@4de4228.

@gitgitgadget gitgitgadget Bot added the seen label Oct 7, 2026
@gitgitgadget

gitgitgadget Bot commented Oct 8, 2026

Copy link
Copy Markdown

There was a status update in the "New Topics" section about the branch je/status-merge-specific-help on the Git mailing list:

"git status" now suggests to use 'git merge --continue', not 'git commit',
when done with conflicts during a 'git merge'.

Waiting for response.
cf. <3a716db0-4c40-4407-9237-f83c0dd37ad8@gmail.com>
source: <pull.2249.git.1791291762665.gitgitgadget@gmail.com>

@jvns

jvns commented Oct 9, 2026

Copy link
Copy Markdown
Author

/submit

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

Submitted as pull.2249.v2.git.1791551486318.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2249/jvns/advice-merge-v2

To fetch this version to local tag pr-2249/jvns/advice-merge-v2:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2249/jvns/advice-merge-v2

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

"Julia Evans" wrote on the Git mailing list (how to reply to this email):

>> 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.

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

"Julia Evans" wrote on the Git mailing list (how to reply to this email):

On Tue, Oct 6, 2026, at 2:20 PM, Junio C Hamano wrote:
> "Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> [Administrivia]
>
> As you have
>
>     cc: D. Ben Knoble" ben.knoble@gmail.com
>
> at the end of your pull request that you gave to GitGitGadget, you
> ended up with a bogus Cc: address that reads
>
>     "D. Ben Knoble <ben.knoble"@gmail.com>
>
> you may want to help improving GGG by raising an issue to reject (or
> ignore) such a malformed address.

done: https://github.com/gitgitgadget/gitgitgadget/issues/2385

> [end of administrivia]
>
>> diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
>> index 942ddbbf0e..a9b435b5e3 100755
>> --- a/t/t7060-wtstatus.sh
>> +++ b/t/t7060-wtstatus.sh
>> @@ -37,7 +37,7 @@ test_expect_success 'M/D conflict does not segfault' '
>>  	cat >expect <<EOF &&
>>  On branch side
>>  You have unmerged paths.
>> -  (fix conflicts and run "git commit")
>> +  (fix conflicts and run "git merge --continue")
>>    (use "git merge --abort" to abort the merge)
>
> This message comes from show_merge_in_progress(), which is called
> only when the code is convinced that it is seeing an unmerged
> index due to a conflicted git merge.  We can therefore make this
> message as merge-specific as we want.  The suggestion to use
> 'git merge --abort' already does this.
>
>> diff --git a/wt-status.c b/wt-status.c
>> index 57772c7501..f7b0dc29d5 100644
>> --- a/wt-status.c
>> +++ b/wt-status.c
>> @@ -1273,7 +1273,7 @@ static void show_merge_in_progress(struct wt_status *s,
>>  		status_printf_ln(s, color, _("You have unmerged paths."));
>>  		if (s->hints) {
>>  			status_printf_ln(s, color,
>> -					 _("  (fix conflicts and run \"git commit\")"));
>> +					 _("  (fix conflicts and run \"git merge --continue\")"));
>>  			status_printf_ln(s, color,
>>  					 _("  (use \"git merge --abort\" to abort the merge)"));
>>  		}
>> @@ -1282,7 +1282,7 @@ static void show_merge_in_progress(struct wt_status *s,
>>  			_("All conflicts fixed but you are still merging."));
>>  		if (s->hints)
>>  			status_printf_ln(s, color,
>> -				_("  (use \"git commit\" to conclude merge)"));
>> +				_("  (use \"git merge --continue\" to conclude merge)"));
>>  	}
>>  	wt_longstatus_print_trailer(s);
>>  }
>
> We could tighten "You have unmerged paths." even further to indicate
> that these paths came from a conflicted 'git merge'.  In the same
> file, show_cherry_pick_in_progress() and show_revert_in_progress()
> already provide instructions very specific to these commands.  Since
> the message for 'git merge' is the oldest, it is not surprising that
> we did not update it when 'git merge --continue', the instructions
> for cherry-pick and revert, or 'git merge --abort' instruction were
> added to the system.  This commit moves us belatedly in the right
> direction, and as always, it is better late than never.

Yeah I agree that "You have unmerged paths." could likely be made
clearer. Appreciate the note about how the implementation works.

> The changes look good.  Thanks.

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. 367ff69
(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`.

Signed-off-by: Julia Evans <julia@jvns.ca>
@jvns

jvns commented Oct 9, 2026

Copy link
Copy Markdown
Author

/submit

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

Submitted as pull.2249.v3.git.1791558823445.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2249/jvns/advice-merge-v3

To fetch this version to local tag pr-2249/jvns/advice-merge-v3:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2249/jvns/advice-merge-v3

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

"Kristoffer Haugsbakk" wrote on the Git mailing list (how to reply to this email):

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?

You can use this `commit --amend` snippet to change it. It worked for me
at least.

    cat >rewrite-msg.sh <<-\EOF
    #!/bin/sh

    file="$1"
    git format-rev --stdin-mode=text --format=reference <"$file" \
        | par g0 \
        | sponge "$file"
    EOF
    chmod +x rewrite-msg.sh
    GIT_EDITOR=./rewrite-msg.sh git commit --amend


>      * change to "conclude the merge" (thanks to Phillip)
>
>[snip]

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

User "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> has been added to the cc: list.

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

"Julia Evans" wrote on the Git mailing list (how to reply to this email):

> 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.

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

Phillip Wood wrote on the Git mailing list (how to reply to this email):

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

> Signed-off-by: Julia Evans <julia@jvns.ca>
> ---
>      status: suggest git merge --continue, not git commit
>      >      Changes in v2:
>      >       * Use git show -s --format=reference to format the reference in the
>         commit message (thanks to Phillip)
>       * change to "conclude the merge" (thanks to Phillip)
>      >      Changes in v3:
>      >       * Actually format the reference correctly (oops)
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2249%2Fjvns%2Fadvice-merge-v3
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2249/jvns/advice-merge-v3
> Pull-Request: https://github.com/gitgitgadget/git/pull/2249
> > Range-diff vs v2:
> >   1:  afc69ffeb8 ! 1:  27678e07a8 status: suggest `git merge --continue`, not `git commit`
>       @@ Commit message
>            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
>       -    `git merge --continue` is intended to be a synonym for `git commit`,
>       -    and the `git merge` man page already suggests to use
>       +    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`.
>        >            Signed-off-by: Julia Evans <julia@jvns.ca>
> > >   t/t7060-wtstatus.sh    | 8 ++++----
>   t/t7512-status-help.sh | 4 ++--
>   wt-status.c            | 4 ++--
>   3 files changed, 8 insertions(+), 8 deletions(-)
> > diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
> index 942ddbbf0e..a9b435b5e3 100755
> --- a/t/t7060-wtstatus.sh
> +++ b/t/t7060-wtstatus.sh
> @@ -37,7 +37,7 @@ test_expect_success 'M/D conflict does not segfault' '
>   	cat >expect <<EOF &&
>   On branch side
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -141,7 +141,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th
>   	cat >expected <<\EOF &&
>   On branch main
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -174,7 +174,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted)
>   	cat >expected <<\EOF &&
>   On branch conflict_second
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -198,7 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' '
>   	cat >expected <<\EOF &&
>   On branch conflict_second
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Changes to be committed:
> diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
> index aca4b6d332..f2e712ac39 100755
> --- a/t/t7512-status-help.sh
> +++ b/t/t7512-status-help.sh
> @@ -31,7 +31,7 @@ test_expect_success 'status when conflicts unresolved' '
>   	cat >expected <<\EOF &&
>   On branch conflicts
>   You have unmerged paths.
> -  (fix conflicts and run "git commit")
> +  (fix conflicts and run "git merge --continue")
>     (use "git merge --abort" to abort the merge)
>   >   Unmerged paths:
> @@ -53,7 +53,7 @@ test_expect_success 'status when conflicts resolved before commit' '
>   	cat >expected <<\EOF &&
>   On branch conflicts
>   All conflicts fixed but you are still merging.
> -  (use "git commit" to conclude merge)
> +  (use "git merge --continue" to conclude the merge)
>   >   Changes to be committed:
>   	modified:   main.txt
> diff --git a/wt-status.c b/wt-status.c
> index 57772c7501..238bb48643 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1273,7 +1273,7 @@ static void show_merge_in_progress(struct wt_status *s,
>   		status_printf_ln(s, color, _("You have unmerged paths."));
>   		if (s->hints) {
>   			status_printf_ln(s, color,
> -					 _("  (fix conflicts and run \"git commit\")"));
> +					 _("  (fix conflicts and run \"git merge --continue\")"));
>   			status_printf_ln(s, color,
>   					 _("  (use \"git merge --abort\" to abort the merge)"));
>   		}
> @@ -1282,7 +1282,7 @@ static void show_merge_in_progress(struct wt_status *s,
>   			_("All conflicts fixed but you are still merging."));
>   		if (s->hints)
>   			status_printf_ln(s, color,
> -				_("  (use \"git commit\" to conclude merge)"));
> +				_("  (use \"git merge --continue\" to conclude the merge)"));
>   	}
>   	wt_longstatus_print_trailer(s);
>   }
> > base-commit: 5a7d1e8045ce66c908f62598e26cbb8df7b39a90

@gitgitgadget

gitgitgadget Bot commented Oct 9, 2026

Copy link
Copy Markdown

Junio C Hamano wrote on the Git mailing list (how to reply to this email):

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.

@gitgitgadget

gitgitgadget Bot commented Oct 10, 2026

Copy link
Copy Markdown

This patch series is no longer integrated into seen.

@gitgitgadget gitgitgadget Bot removed the seen label Oct 10, 2026
@gitgitgadget

gitgitgadget Bot commented Oct 10, 2026

Copy link
Copy Markdown

There was a status update in the "Cooking" section about the branch je/status-merge-specific-help on the Git mailing list:

"git status" now suggests to use 'git merge --continue', not 'git commit',
when done with conflicts during a 'git merge'.

Will merge to 'next'?
cf. <3e43682f-6dbf-49fc-91e4-2019f3c13f48@gmail.com>
source: <pull.2249.v3.git.1791558823445.gitgitgadget@gmail.com>

@gitgitgadget

gitgitgadget Bot commented Oct 10, 2026

Copy link
Copy Markdown

This patch series was integrated into seen via git@4b8faf3.

@gitgitgadget gitgitgadget Bot added the seen label Oct 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant