git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase: make resolve message clearer for inexperienced users

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 17, 2017, 21:59 UTC
Message-ID
<xmqqr2xeg1xl.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20170716194220.1304-1-william.duclot@gmail.com>
William Duclot <william.duclot@gmail.com> writes:
Show 7 quoted lines
> -$(gettext 'When you have resolved this problem, run "git rebase --continue".
> -If you prefer to skip this patch, run "git rebase --skip" instead.
> -To check out the original branch and stop rebasing, run "git rebase --abort".')
> +$(gettext 'Resolve all conflicts manually, mark them as resolved with
> +"git add/rm <conflicted_files>", then run "git rebase --continue".
> +You can instead skip this commit: run "git rebase --skip".
> +To abort and get back to the state before "git rebase -i", run "git rebase --abort".')

This may be my fault, but we do not need to limit this to "reabse -i"; I'll drop " -i" from this line while queuing.

Thanks.
Previous: William Duclot
Message 2 of 2 in “rebase: make resolve message clearer for inexperienced users”
  1. rebase: make resolve message clearer for inexperienced usersWilliam Duclot, Jul 16, 2017
  2. Junio C HamanoJul 17, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.