Re: [PATCH v6] [GSOC] cherry-pick: use better advice message

From: ZheNing Hu <adlternative@gmail.com>
Date: Aug 21, 2021, 01:40 UTC
Message-ID: <CAOLTT8T3=GCvkdiXvO9wprXRoDJ58P_CZBjJ2YDQVHv_eCiXqw@mail.gmail.com>
In-Reply-To: <xmqqlf4x2weh.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> 于2021年8月20日周五 上午1:10写道：

Show 9 quoted lines

>
> > +             else if (opts->action == REPLAY_PICK)
> > +                     advise(_("Resolve all conflicts manually, mark them as resolved with\n"
>
> Do we need to say "manually"?  Dropping the word would make the
> message more concise.  Not repeating the word "resolve" by saying
> something like "after resolving the conflicts, mark them with ..."
> would probably be a much better phrasing, too.
>

Yeah. Note the $reslovemsg in git-rebase--preserve-merges.sh, I copied it from here. Perhaps it is also worth modifying?

Show 6 quoted lines

> > +                              "\"git add/rm <conflicted_files>\", then run\n"
>
> <paths> (or <pathspec>) not <conflicted_files>; you can resolve many
> files in a directory and give the pathspec to match the directory to
> mark all the files in there as resolved.
>

Indeed so.

Show 12 quoted lines

> > +                              "\"git cherry-pick --continue\".\n"
> > +                              "You can instead skip this commit: run \"git cherry-pick --skip\".\n"
>
> Inconsistent use of prose in the above and ": run" here.
>
>         You can instead skip this commit with "git cherry-pick --skip"
>
> > +             else if (opts->action == REPLAY_REVERT)
>
> Likewise.
>
> Thanks.

Thanks. -- ZheNing Hu