Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-26 Thread Phillip Wood
On 24/07/17 21:53, Junio C Hamano wrote: Phillip Wood writes: git rebase --continue requiring one to git add first confuses/annoys me too. I started a patch to autostage unstaged changes if they don't contain conflict markers a couple of weeks ago, I'll clean it up

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-24 Thread Junio C Hamano
Phillip Wood writes: > git rebase --continue requiring one to git add first confuses/annoys me > too. I started a patch to autostage unstaged changes if they don't > contain conflict markers a couple of weeks ago, I'll clean it up and > post it later this week. As

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-24 Thread Phillip Wood
On 16/07/17 12:39, Philip Oakley wrote: > > From: "Junio C Hamano" > Sent: Wednesday, July 12, 2017 10:29 PM >> William Duclot writes: >> - The original said "When you have resolved this problem", without giving a guidance how to

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-16 Thread Philip Oakley
From: "Junio C Hamano" Sent: Wednesday, July 12, 2017 10:29 PM William Duclot writes: - 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

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-12 Thread Junio C Hamano
William Duclot writes: >> - 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

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-10 Thread William Duclot
Junio C Hamano writes: > William Duclot 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=" > >

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-10 Thread Junio C Hamano
William Duclot 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

[PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-09 Thread William Duclot
The git UI can be improved by addressing the error messages to those they help: inexperienced and casual git users. To this intent, it is helpful to make sure the terms used in those messages can be understood by this segment of users, and that they guide them to resolve the problem. In