Stephen Morton <stephen.morton@xxxxxxxxx> writes:
> [snip]
> On 2016-08-16 4:44 AM, Remi Galan Alfonso wrote:
>> Hi Stephen,
>>
>> Stephen Morton <stephen.morton@xxxxxxxxx> 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?
> A previous comment had indicated that having 4 lines was too many. And I
> tend to agree. So I tried to squash it into 3. Back in xterm days, 80
> characters was sacrosanct, but is it really a big deal to exceed it now?
Either way (3 or 4 lines) I find it strange to have both advices
start in the same way except that one is split and not the other.
I cannot tell if it's a big deal or not to exceed 80 characters
but FWIW most of my stuff (terminal and emacs) is 80 columns
long, and I haven't known the "xterm days".
Thanks,
Rémi
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html