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

2017-07-17 Thread Junio C Hamano
William Duclot writes: > -$(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 all conflicts ma

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

2017-07-16 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 particular