From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Cc: Stephen Morton <stephen.morton@nokia.com>,
Jeff King <peff@peff.net>, Stefan Beller <sbeller@google.com>,
git@vger.kernel.org
Subject: Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits
Date: Wed, 17 Aug 2016 11:13:43 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1608171112580.4924@virtualbox> (raw)
In-Reply-To: <968827697.1226723.1471337060482.JavaMail.zimbra@ensimag.grenoble-inp.fr>
Hi,
On Tue, 16 Aug 2016, Remi Galan Alfonso wrote:
> Stephen Morton <stephen.morton@nokia.com> writes:
> > + if (multiple_commits)
> > + advise(_("after resolving the conflicts,
> > mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
> > + "then continue with 'git %s
> > --continue'\n"
> > + "or cancel with 'git %s
> > --abort'" ), action_name(opts), action_name(opts));
> > + else
> > + advise(_("after resolving the
> > conflicts, mark the corrected paths\n"
> > + "with 'git add <paths>' or 'git
> > rm <paths>'\n"
> > + "and commit the result with
> > 'git commit'"));
>
> In both cases (multiple_commits or not), the beginning of the advise
> is nearly the same, with only a '\n' in the middle being the
> difference:
>
> multiple_commits:
> "after resolving the conflicts, mark the corrected paths with 'git
> add <paths>' or 'git rm <paths>'\n"
>
> !multiple_commits:
> "after resolving the conflicts, mark the corrected paths\n with 'git
> add <paths>' or 'git rm <paths>'\n"
> ~~~~~~~^
>
> In 'multiple_commits' case the advise is more than 80 characters long,
> did you forget the '\n' in that case?
>
> If you end up using the same beginning of advice, maybe it's possible
> to give it before the 'if(multiple_commits)' and avoid duplication of
> the lines.
I concur with this, and also with Christian's advice to append the
parameter consistently as last one, and also with renaming it to
"last_commit".
Ciao,
Johannes
next prev parent reply other threads:[~2016-08-17 9:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 19:21 git cherry-pick conflict error message is deceptive when cherry-picking multiple commits Stephen Morton
2016-08-14 11:44 ` Christian Couder
2016-08-17 13:42 ` Stephen Morton
2016-08-17 14:24 ` Remi Galan Alfonso
2016-08-17 15:31 ` Junio C Hamano
2016-08-18 14:15 ` Johannes Schindelin
2016-08-16 8:44 ` Remi Galan Alfonso
2016-08-17 9:13 ` Johannes Schindelin [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-26 19:40 Stephen Morton
2016-07-26 20:18 ` Stefan Beller
2016-07-26 20:30 ` Jeff King
2016-07-26 20:44 ` Stephen Morton
2016-07-27 14:15 ` Stephen Morton
2016-07-27 15:03 ` Johannes Schindelin
2016-07-27 15:30 ` Stephen Morton
2016-08-01 9:12 ` Johannes Schindelin
2016-08-10 19:14 ` Stephen Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1608171112580.4924@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=sbeller@google.com \
--cc=stephen.morton@nokia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).