From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Thomas S. Dye" <tsd@tsdye.com>
Subject: make update error
Date: Mon, 31 Aug 2009 19:04:44 -1000
Message-ID: <34C923AA-FD76-43C3-8B5D-8433E27036A5@tsdye.com>
Mime-Version: 1.0 (Apple Message framework v936)
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MiLea-0007Np-5E
	for emacs-orgmode@gnu.org; Tue, 01 Sep 2009 01:11:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MiLeV-0007Nd-9W
	for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 01:11:35 -0400
Received: from [199.232.76.173] (port=41655 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MiLeV-0007Na-2f
	for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 01:11:31 -0400
Received: from outbound-mail-141.bluehost.com ([67.222.38.31]:51661)
	by monty-python.gnu.org with smtp (Exim 4.60)
	(envelope-from <tsd@tsdye.com>) id 1MiLeU-0008AJ-HW
	for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 01:11:30 -0400
Received: from cpe-24-161-159-72.hawaii.res.rr.com ([24.161.159.72]
	helo=[192.168.1.3]) by box472.bluehost.com with esmtpa (Exim 4.69)
	(envelope-from <tsd@tsdye.com>) id 1MiLXx-0001kT-Rv
	for Emacs-orgmode@gnu.org; Mon, 31 Aug 2009 23:04:46 -0600
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Emacs-orgmode@gnu.org

Aloha all,

Apologies in advance for a question well below the prevailing software  
expertise on this list and somewhat off topic.  I looked around for an  
answer to this with no luck.

I'm trying to update the org-mode installation on my Mac, like this:

sudo make update

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.

Any help appreciated.  Org-mode is an indispensable part of my work  
life now.

All the best,
Tom