From: Jay Soffian <jaysoffian@gmail.com>
Date: Mon, 10 Mar 2008 13:56:40 GMT
Subject: Re: "git checkout" branch switching safety broken in 'next'
Message-ID: <76718490803100656k6607e00ar1cce14aedffb3b27@mail.gmail.com>
In-Reply-To: <fr2v0s$cdb$1@ger.gmane.org>

2008/3/10 Jakub Narebski <jnareb@gmail.com>:
> 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.