emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Thomas S. Dye" <tsd@tsdye.com>
To: Emacs-orgmode@gnu.org
Subject: make update error
Date: Mon, 31 Aug 2009 19:04:44 -1000	[thread overview]
Message-ID: <34C923AA-FD76-43C3-8B5D-8433E27036A5@tsdye.com> (raw)

Aloha all,

Apologies in advance for a question well below the prevailing software  
expertise on this list and somewhat off topic.  I looked around for an  
answer to this with no luck.

I'm trying to update the org-mode installation on my Mac, like this:

sudo make update

git pull counts, compresses, receives objects, resolves deltas,  
updates and fails with this message:

error: Entry 'Makefile' not uptodate. Cannot merge.

As far as I know Makefile is up-to-date.

Any help appreciated.  Org-mode is an indispensable part of my work  
life now.

All the best,
Tom

             reply	other threads:[~2009-09-01  5:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-01  5:04 Thomas S. Dye [this message]
2009-09-01  5:53 ` make update error Nick Dokos
2009-09-01 14:07   ` Bernt Hansen
2009-09-01 14:37     ` Nick Dokos
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=34C923AA-FD76-43C3-8B5D-8433E27036A5@tsdye.com \
    --to=tsd@tsdye.com \
    --cc=Emacs-orgmode@gnu.org \
    /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).