From: Nick Dokos <nicholas.dokos@hp.com>
To: "Thomas S. Dye" <tsd@tsdye.com>
Cc: Emacs-orgmode@gnu.org
Subject: Re: make update error
Date: Tue, 01 Sep 2009 01:53:38 -0400 [thread overview]
Message-ID: <11144.1251784418@gamaville.dokosmarshall.org> (raw)
In-Reply-To: Message from "Thomas S. Dye" <tsd@tsdye.com> of "Mon, 31 Aug 2009 19:04:44 -1000." <34C923AA-FD76-43C3-8B5D-8433E27036A5@tsdye.com>
Thomas S. Dye <tsd@tsdye.com> wrote:
> 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.
>
You probably changed it without realizing it. If you don't care about
the changes (you can check with "git diff": it will tell you what's
different between your repository and the working tree), you can
checkout the original version of the Makefile and then do the pull:
git checkout Makefile
git pull
This will probably do it, but if worse comes to worse, you can always
just throw away the whole repository and start from scratch:
git clone git://repo.or.cz/org-mode.git .
You might also want to have a local branch, where you can keep any local
modifications, e.g. if the changes to the Makefile were deliberate and
you wanted to keep them, then you could save the Makefile temporarily
(mv Makefile /tmp/Makefile), do the above commands, then create the local branch:
git branch local
change to it:
git checkout local
(note that checkout has a couple of related but different meanings).
Move the modified Makefile back and commit the changes:
mv /tmp/Makefile .
git commit -a
When it it time to pull again, you can change back to the (pristine)
master branch and pull:
git checkout master
git pull
Then you can rebase your local changes on top of the new bits:
git rebase master local
It's a good way to keep a few local modifications and carry them forward
to any new version of org (of course, if the new version and your changes
change the same area of a file, you might end up with merge conflicts that
you'll have to resolve: but most of the time, it just works).
HTH,
Nick
next prev parent reply other threads:[~2009-09-01 5:55 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 [this message]
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=11144.1251784418@gamaville.dokosmarshall.org \
--to=nicholas.dokos@hp.com \
--cc=Emacs-orgmode@gnu.org \
--cc=tsd@tsdye.com \
/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).