dilim/git
1
0 Fork 0
mirror of https://github.com/git/git.git synced 2026-11-06 05:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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`.

Signed-off-by: Julia Evans <julia@jvns.ca>
Acked-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Julia Evans authored and Junio C Hamano committed 2026-10-09 11:38:42 -07:00
1 parent a018953688
commit b6d18b5d68
3 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

t/t7060-wtstatus.sh
+4 -4
View File
@@ -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:
t/t7512-status-help.sh
+2 -2
View File
@@ -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
wt-status.c
+2 -2
View File
@@ -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);
}