Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvns wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions t/t7060-wtstatus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions t/t7512-status-help.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions wt-status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"));
}
Expand All @@ -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);
}
Expand Down
Loading