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. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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