emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Christian Moe <mail@christianmoe.com>
To: nicholas.dokos@hp.com
Cc: emacs-orgmode@gnu.org, Dror Atariah <drorata@gmail.com>
Subject: Re: Update org-mode
Date: Sun, 03 Apr 2011 07:45:22 +0200	[thread overview]
Message-ID: <4D980972.1030501@christianmoe.com> (raw)
In-Reply-To: <12066.1301778170@alphaville.dokosmarshall.org>

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
>
>
>
>

next prev parent reply	other threads:[~2011-04-03  5:42 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-01 15:20 Update org-mode Dror Atariah
2011-04-01 16:08 ` Ian Barton
2011-04-01 16:24 ` Jambunathan K
2011-04-05 15:31   ` Dror Atariah
2011-04-05 17:03     ` Ian Barton
2011-04-01 17:08 ` Bernt Hansen
2011-04-01 17:39   ` Nick Dokos
2011-04-01 18:14     ` Bernt Hansen
2011-04-01 17:58 ` Yagnesh Raghava Yakkala
2011-04-01 19:35   ` Dror Atariah
2011-04-01 20:03     ` Nick Dokos
2011-04-03  8:12       ` Dror Atariah
2011-04-03  8:23         ` Jambunathan K
     [not found]           ` <F1BFD612-B50C-4247-8261-1058352CF0E4@gmail.com>
     [not found]             ` <81zko7hft2.fsf@gmail.com>
2011-04-03  9:47               ` Dror Atariah
2011-04-03 11:53                 ` Jambunathan K
2011-04-02 20:13 ` Christian Moe
2011-04-02 20:45   ` Achim Gratz
2011-04-02 21:02   ` Nick Dokos
2011-04-03  5:45     ` Christian Moe [this message]
2011-04-03  8:08   ` Dror Atariah
2011-04-03  9:55     ` Christian Moe
2011-04-03 10:35       ` Dror Atariah
2011-04-03 11:31     ` Achim Gratz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D980972.1030501@christianmoe.com \
    --to=mail@christianmoe.com \
    --cc=drorata@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=nicholas.dokos@hp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).