From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Dokos <nicholas.dokos@hp.com>
Subject: Re: make update error
Date: Tue, 01 Sep 2009 10:37:41 -0400
Message-ID: <13195.1251815861@gamaville.dokosmarshall.org>
References: <34C923AA-FD76-43C3-8B5D-8433E27036A5@tsdye.com>
	<11144.1251784418@gamaville.dokosmarshall.org>
	<877hwisqq4.fsf@gollum.intra.norang.ca>
Reply-To: nicholas.dokos@hp.com
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 1MiUWa-0003aV-TN
	for emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:39:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MiUWW-0003Zw-9x
	for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:39:56 -0400
Received: from [199.232.76.173] (port=36641 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MiUWW-0003Zt-4m
	for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:39:52 -0400
Received: from vms173015pub.verizon.net ([206.46.173.15]:50814)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <nick@gamaville.dokosmarshall.org>)
	id 1MiUWV-0000Vo-RZ
	for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:39:52 -0400
Received: from gamaville.dokosmarshall.org ([98.110.172.159])
	by vms173015.mailsrvcs.net
	(Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008;
	32bit)) with ESMTPA id <0KPA00LV5RASDI93@vms173015.mailsrvcs.net> for
	Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 09:37:53 -0500 (CDT)
In-reply-to: Message from Bernt Hansen <bernt@norang.ca> of
	"Tue, 01 Sep 2009 10:07:47 EDT." <877hwisqq4.fsf@gollum.intra.norang.ca>
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: Bernt Hansen <bernt@norang.ca>
Cc: Emacs-orgmode@gnu.org

Bernt Hansen <bernt@norang.ca> wrote:

> Nick Dokos <nicholas.dokos@hp.com> writes:
> 
> > Thomas S. Dye <tsd@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>
>
> There's a description of how to do this local branch with rebase
> automagically at 
> 
> http://orgmode.org/worg/org-faq.php#keeping-local-changes-current-with-Org-mode-development
> 
> There's not need to change back to the master branch - just pull (with
> rebase) into your local branch.
> 

Nice! Thanks for pointing that out (the document *and* the method).

Nick