2008/3/10 Jakub Narebski <jnareb@xxxxxxxxx>:
> Junio C Hamano wrote:
> > error: Entry 'foo' not uptodate. Cannot merge.
>
> By the way, could this error message be made less cryptic? It is there
> since the very beginning, and was not changed during making error
> messages more user friendly...
+1. Most concise is probably:
* "error: 'foo' has uncommitted changes."
More helpful messages that I can think of are probably too verbose. e.g.:
* "error: 'foo' differs in target branch but has uncommitted changes."
* "error: 'foo' has uncommitted changes. Commit, use -f to lose
changes, or -m to merge changes in target branch."
j.
--
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
