[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Orgmode] Re: make update error
From: |
Nick Dokos |
Subject: |
[Orgmode] Re: make update error |
Date: |
Tue, 01 Sep 2009 10:37:41 -0400 |
Bernt Hansen <address@hidden> wrote:
> Nick Dokos <address@hidden> writes:
>
> > Thomas S. Dye <address@hidden> 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