Nick Dokos nicholas.do...@hp.com writes:
Thomas S. Dye t...@tsdye.com wrote:
git pull counts, compresses, receives objects, resolves deltas,
updates and fails with this message:
error: Entry 'Makefile' not uptodate. Cannot merge.
As far as I know Makefile is up-to-date.
You might
Bernt Hansen be...@norang.ca wrote:
Nick Dokos nicholas.do...@hp.com writes:
Thomas S. Dye t...@tsdye.com wrote:
git pull counts, compresses, receives objects, resolves deltas,
updates and fails with this message:
error: Entry 'Makefile' not uptodate. Cannot merge.
SNIP
On Sep 1, 2009, at 4:07 AM, Bernt Hansen wrote:
Nick Dokos nicholas.do...@hp.com writes:
Thomas S. Dye t...@tsdye.com wrote:
git pull counts, compresses, receives objects, resolves deltas,
updates and fails with this message:
error: Entry 'Makefile' not uptodate. Cannot merge.
As far as I
