Re: [PATCH 01/18] advice: Introduce error_resolve_conflict

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jul 21, 2011 at 11:35:44AM -0400, Phil Hord wrote:

> >error: 'commit' is not possible because you have unmerged files.
> >hint: Please, fix them up in the work tree ...
> >hint: ...
> >fatal: Exiting because of an unresolved conflict.
> 
> This is a tiny grammar nit, but "Please," sounds superfluous now that
> it's preceded by "hint:".  "Hint" sounds like I'm doing you a favor
> by telling you something to do.  "Please" sounds like you're doing me
> a favor by doing something.  Together they just sound like a typo.

Agreed.

> In either case, the comma after "Please" is wrong.  (There are other
> messages in the git code which make this same mistake, but there are
> more which use "Please <imperative-verb>..." correctly.)

I don't know that I'd go so far as to say it's wrong, exactly. Clearly
by traditional rules of written grammar it is, but I think the attempt
was to convey the pause that one might include if one were speaking the
sentence.

Still, I think I find it more readable without the comma, and better
still if every spot were converted to "hint: ". This question has come
up once or twice before, too, so I don't know that a patch removing the
commas would be out of line.

-Peff
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]