From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Patrick Doyle <wpdster@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: path/to/some/file: needs update
Date: Fri, 03 Dec 2010 19:58:55 +0100 [thread overview]
Message-ID: <vpqk4jq3cpc.fsf@bauges.imag.fr> (raw)
In-Reply-To: <AANLkTinsUZCUJamUHWN=H7tyL5nKACmEcyvG6hpsTDtv@mail.gmail.com> (Patrick Doyle's message of "Fri\, 3 Dec 2010 13\:34\:24 -0500")
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/
next prev parent reply other threads:[~2010-12-03 18:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 18:34 path/to/some/file: needs update Patrick Doyle
2010-12-03 18:52 ` Jonathan Nieder
2010-12-03 18:58 ` Matthieu Moy [this message]
2010-12-06 0:44 ` Patrick Doyle
2010-12-06 19:06 ` Neal Kreitzinger
2010-12-06 19:19 ` Neal Kreitzinger
2010-12-06 19:23 ` Patrick Doyle
2010-12-06 20:47 ` Ben Walton
2010-12-07 15:23 ` Drew Northup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqk4jq3cpc.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=wpdster@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).