From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christian Moe <mail@christianmoe.com>
Subject: Re: Update org-mode
Date: Sun, 03 Apr 2011 07:45:22 +0200
Message-ID: <4D980972.1030501@christianmoe.com>
References: <BEBBFC33-B6D3-490B-80DD-AB839D53A4E9@gmail.com>
	<4D97836C.8050309@christianmoe.com>
	<12066.1301778170@alphaville.dokosmarshall.org>
Reply-To: mail@christianmoe.com
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=57659 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q6G4T-0001yr-Vm
	for emacs-orgmode@gnu.org; Sun, 03 Apr 2011 01:42:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@christianmoe.com>) id 1Q6G4O-0006NM-S1
	for emacs-orgmode@gnu.org; Sun, 03 Apr 2011 01:41:57 -0400
Received: from mars.hitrost.net ([91.185.211.18]:27204)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@christianmoe.com>) id 1Q6G4O-0006Mx-MW
	for emacs-orgmode@gnu.org; Sun, 03 Apr 2011 01:41:52 -0400
In-Reply-To: <12066.1301778170@alphaville.dokosmarshall.org>
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: nicholas.dokos@hp.com
Cc: emacs-orgmode@gnu.org, Dror Atariah <drorata@gmail.com>

Nick, Achim,

Thanks for this. Other git newbies should obviously ignore my clumsy 
solution and follow those instructions instead.

I guess I missed them because I just stopped looking when I had an 
approach that worked. Embarrassed now.

Dror may still want to check those targets in his Makefile against the 
contents of his Aquamacs.app package.

Yours,
Christian

On 4/2/11 11:02 PM, Nick Dokos wrote:
> 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
>
>
>
>