Bernt Hansen <be...@norang.ca> wrote: > Nick Dokos <nicholas.do...@hp.com> writes: > > > Thomas S. Dye <t...@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 _______________________________________________ Emacs-orgmode mailing list Remember: use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
