From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 03 Dec 2010 18:58:55 GMT
Subject: Re: path/to/some/file: needs update
Message-ID: <vpqk4jq3cpc.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTinsUZCUJamUHWN=H7tyL5nKACmEcyvG6hpsTDtv@mail.gmail.com>

Patrick Doyle <wpdster@gmail.com> writes:

> path/to/some/file: needs update.
>
> Then things got worse... one of the messages said:
>
> error: Entry 'path/to/some/binaryfile' not uptodate.  Cannot merge

Which commands triggered these messages? Which version of Git?

AFAICT, these messages never appear anymore in normal (porcelain) use
in recent Gits.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/