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

From: ZheNing Hu <adlternative@gmail.com>
To: phillip.wood@dunelm.org.uk
Cc: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>,
	"Git List" <git@vger.kernel.org>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Christian Couder" <christian.couder@gmail.com>,
	"Hariom Verma" <hariom18599@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Han-Wen Nienhuys" <hanwen@google.com>,
	"Ramkumar Ramachandra" <artagnon@gmail.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: Re: [PATCH 2/2] [GSOC] cherry-pick: use better advice message
Date: Mon, 2 Aug 2021 21:35:57 +0800	[thread overview]
Message-ID: <CAOLTT8TberYK1DtwMaEjtZLeVr1JM0tbU1DXW=Us8D_Yrsg-mA@mail.gmail.com> (raw)
In-Reply-To: <0a2ab793-de4d-d8d1-4d1d-a018fa0f252c@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> 于2021年8月1日周日 下午6:14写道：
>

> > This is the improved advice:
> >
> > hint: Resolve all conflicts manually, mark them as resolved with
> > hint: "git add/rm <conflicted_files>", then run "git cherry-pick \
> > --continue".
> > hint: You can instead skip this commit: run "git cherry-pick --skip".
> > hint: To abort and get back to the state before "git cherry-pick",
> > hint: run "git cherry-pick --abort".
>
> This new wording matches what we have for rebase which is good, I am
> slightly worried that the lines end up being quite long though they are
> just under 80 characters. It might be worth splitting the line that
> mentions running "git cherry-pick --continue" so it is a bit shorter.
>

Agree.

> Best Wishes
>
> Phillip
>
Thanks.
--
ZheNing Hu