Re: [GSoC][PATCH 3/3] cherry-pick/revert: update hints

From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Date: Jun 10, 2019, 05:28 UTC
Message-ID: <20190610052823.17013-1-rohit.ashiwal265@gmail.com>
In-Reply-To: <61a8bfde-018c-5a69-5abd-89d4a332e39e@gmail.com>

Hey Phillip

On Sun, 9 Jun 2019 19:03:02 +0100 Phillip Wood <phillip.wood123@gmail.com> wrote:

Show 16 quoted lines

> 
> Hi Rohit
> 
> On 08/06/2019 20:19, Rohit Ashiwal wrote:
> > [...]
> > @@ -2654,8 +2654,8 @@ static int create_seq_dir(void)
> >  {
> >  	if (file_exists(git_path_seq_dir())) {
> >  		error(_("a cherry-pick or revert is already in progress"));
> > -		advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
> > -		advise(_("or  \"git revert (--continue | --quit | --abort)\""));
> > +		advise(_("try \"git cherry-pick (--continue | --skip | --quit | --abort)\""));
> > +		advise(_("or  \"git revert (--continue | --skip | --quit | --abort)\""));
> 
> If the user has already committed the conflict resolution then we don't
> want to recommend --skip as there is nothing to skip.

I think it is more about suggesting what are all the possibilities you can try and not about intelligently suggesting what you should do. ofc, we can not use `revert --<option>` while cherry-picking.( we should not be able to do so in ideal conditions, but the world does not work as we think it should). Still we are suggesting so here.

Also, I think it is more reasonable to make "this" a part of patch which will cover "tailored" advice messages which is also a topic of discussion as I described here[1].

> Best Wishes
> 
> Phillip

Thanks Rohit

[1]: https://public-inbox.org/git/20190609200038.GD28007@hank.intra.tgummerer.com/T/#mbb071f6e29c69f291ecd9c61c71b889774ff33b2