From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Dokos <nicholas.dokos@hp.com>
Subject: Re: Update org-mode
Date: Sat, 02 Apr 2011 17:02:50 -0400
Message-ID: <12066.1301778170@alphaville.dokosmarshall.org>
References: <BEBBFC33-B6D3-490B-80DD-AB839D53A4E9@gmail.com>
	<4D97836C.8050309@christianmoe.com>
Reply-To: nicholas.dokos@hp.com
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=56863 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q67yP-0005n6-31
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 17:03:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <nick@dokosmarshall.org>) id 1Q67yL-00086a-VD
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 17:03:07 -0400
Received: from vms173001pub.verizon.net ([206.46.173.1]:50301)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nick@dokosmarshall.org>) id 1Q67yL-00080n-QL
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 17:03:05 -0400
Received: from alphaville.dokosmarshall.org ([unknown] [173.76.32.106])
	by vms173001.mailsrvcs.net
	(Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16
	2009)) with ESMTPA id <0LJ100203MGRX2M0@vms173001.mailsrvcs.net> for
	emacs-orgmode@gnu.org; Sat, 02 Apr 2011 16:02:51 -0500 (CDT)
In-reply-to: Message from Christian Moe <mail@christianmoe.com> of
	"Sat, 02 Apr 2011 22:13:32 +0200." <4D97836C.8050309@christianmoe.com>
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/archive/html/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: mail@christianmoe.com
Cc: nicholas.dokos@hp.com, emacs-orgmode@gnu.org, Dror Atariah <drorata@gmail.com>

Christian Moe <mail@christianmoe.com> wrote:

> I quickly found that git pulls would overwrite my hand-edited
> Makefile, and a hand-edited Makefile caused conflicts on the next
> pull, and I didn't understand git at all.
> 

In 

   http://thread.gmane.org/gmane.emacs.orgmode/17102/focus=17115

Bernt pointed out the existence of an FAQ that explains in detail
the procedure for setting up a local branch that will rebase your
local modifications on top of whatever you pull:

   http://orgmode.org/worg/org-faq.php#keeping-local-changes-current-with-Org-mode-development

Achim's reply in this thread also explains this, but the extra detail
in the FAQ might be helpful.

Nick