From: Nick Dokos <nicholas.dokos@hp.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Emacs-orgmode@gnu.org
Subject: Re: make update error
Date: Tue, 01 Sep 2009 10:37:41 -0400 [thread overview]
Message-ID: <13195.1251815861@gamaville.dokosmarshall.org> (raw)
In-Reply-To: Message from Bernt Hansen <bernt@norang.ca> of "Tue, 01 Sep 2009 10:07:47 EDT." <877hwisqq4.fsf@gollum.intra.norang.ca>
Bernt Hansen <bernt@norang.ca> wrote:
> Nick Dokos <nicholas.dokos@hp.com> writes:
>
> > Thomas S. Dye <tsd@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
next prev parent reply other threads:[~2009-09-01 14:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-01 5:04 make update error Thomas S. Dye
2009-09-01 5:53 ` Nick Dokos
2009-09-01 14:07 ` Bernt Hansen
2009-09-01 14:37 ` Nick Dokos [this message]
2009-09-01 17:53 ` Thomas S. Dye
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=13195.1251815861@gamaville.dokosmarshall.org \
--to=nicholas.dokos@hp.com \
--cc=Emacs-orgmode@gnu.org \
--cc=bernt@norang.ca \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).