From: William Duclot <william.duclot@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users
Date: Mon, 10 Jul 2017 20:31:01 +0200 [thread overview]
Message-ID: <20170710183101.GA13122@Haydn> (raw)
In-Reply-To: <xmqqvan06yo8.fsf@gitster.mtv.corp.google.com>
Junio C Hamano writes:
> William Duclot <william.duclot@gmail.com> writes:
>
> > diff --git a/git-rebase.sh b/git-rebase.sh
> > index 2cf73b88e..50457f687 100755
> > --- a/git-rebase.sh
> > +++ b/git-rebase.sh
> > @@ -55,9 +55,10 @@ LF='
> > '
> > ok_to_skip_pre_rebase=
> > resolvemsg="
> > -$(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 this conflict manually, mark it as resolved with "git add <conflicted_file>",
> > +then run "git rebase --continue".
> > +You can instead skip this commit: run "git rebase --skip".
> > +To stop the whole rebasing and get back to your pre-rebase state, run "git rebase --abort".')
> > "
>
> I find the updated one easier to follow in general.
> Disecting the phrases in the above:
>
> - The original said "When you have resolved this problem", without
> giving a guidance how to resolve, and without saying what the
> problem is. The updated one says "conflict" to clarify the
> "problem", and suggests "git add" as the tool to use after a
> manual resolition.
>
> Modulo that there are cases where "git rm" is the right tool, the
> updated one is strict improvement.
I also wrote "<conflicted_file>" when there could be several. Maybe
'mark it as resolved with "git add/rm"' would be a better (and shorter)
formulation?
> - The original said "to check out the original branch and stop
> rebasing", and the updated one says "to stop and get back to",
> which is in a more logical order.
>
> "the whole rebasing" used as a noun feels something is missing
> there, though. I wonder if "To get back to the state before you
> started 'rebase -i', run 'git rebase --abort'" is sufficient,
> without saying anything further about abandoning the rebase in
> progress (i.e. "and stop rebasing" or "stop the whole rebasing").
Definitely seems clearer to me: straight to the point.
> Thanks.
Happy to see this patch seems interesting to you. I feel like a lot of
git messages could be improved this way to offer a UI more welcoming to
inexperienced user (which is a *broad* segment of users). But I am not
aware of the cost of translation of this kind of patch: would several
patches like this one be welcomed?
next prev parent reply other threads:[~2017-07-10 18:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-09 20:25 [PATCH/RFC] rebase: make resolve message clearer for inexperienced users William Duclot
2017-07-10 16:31 ` Junio C Hamano
2017-07-10 18:31 ` William Duclot [this message]
2017-07-12 21:29 ` Junio C Hamano
2017-07-16 11:39 ` Philip Oakley
2017-07-24 9:51 ` Phillip Wood
2017-07-24 20:53 ` Junio C Hamano
2017-07-26 14:37 ` Phillip Wood
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=20170710183101.GA13122@Haydn \
--to=william.duclot@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).