On Fri, Dec 3, 2010 at 1:58 PM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > Patrick Doyle <wpdster@xxxxxxxxx> 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. Ahhh... that's something. I just checked. The box they were using is an RHEL 5 box that has 1.5.5.6 installed on it. Perhaps it's time to upgrade their git. I'll go see what repo I need to add to RHEL to get a more recent git. Thanks. --wpd -- 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