[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] Update org-mode
|
From: |
Nick Dokos |
|
Subject: |
Re: [O] Update org-mode |
|
Date: |
Sat, 02 Apr 2011 17:02:50 -0400 |
Christian Moe <address@hidden> 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
- Re: [O] Re: Update org-mode, (continued)
- [O] Re: Update org-mode, Yagnesh Raghava Yakkala, 2011/04/01
- [O] Re: Update org-mode, Dror Atariah, 2011/04/01
- Re: [O] Re: Update org-mode, Nick Dokos, 2011/04/01
- Re: [O] Re: Update org-mode, Dror Atariah, 2011/04/03
- [O] Re: Update org-mode, Jambunathan K, 2011/04/03
- Message not available
- Message not available
- [O] Re: Update org-mode, Dror Atariah, 2011/04/03
- [O] Re: Update org-mode, Jambunathan K, 2011/04/03
Re: [O] Update org-mode, Christian Moe, 2011/04/02