From: "Thomas S. Dye" <tsd@tsdye.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Emacs-orgmode@gnu.org
Subject: Re: make update error
Date: Tue, 1 Sep 2009 07:53:52 -1000 [thread overview]
Message-ID: <DA2F4474-C243-42A8-BD64-161765CD433A@tsdye.com> (raw)
In-Reply-To: <877hwisqq4.fsf@gollum.intra.norang.ca>
On Sep 1, 2009, at 4:07 AM, Bernt Hansen 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.
>>>
>>> As far as I know Makefile is up-to-date.
>>>
>> 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).
>
> 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.
>
> -Bernt
Aloha Nick and Bernt,
Thanks for the very useful advice and the pointer to the FAQ that
deals specifically with my situation. I very much appreciate not
receiving a RTFM reply.
It turns out I had edited the top of the Makefile, per the
instructions, to configure it to my Mac setup. To my mind, this edit
was a "configuration" and not a "local change." When I looked through
the FAQ I didn't stop to read "How can I keep local changes and still
track Org mode development" because I hadn't made any changes to the
lisp source of org-mode, so thought I couldn't possibly have made a
"local change." I think I can see now how the distinction I was
making between a "local change" and a "configuration" isn't sensible
from a developer's point of view, but I'm not sure I would have been
able to do so without falling back on my graduate school training in
linguistic anthropology!
I'm looking forward to isolating my local changes from the master
branch, a task I am scheduling now with C-c r ...
All the best,
Tom
prev parent reply other threads:[~2009-09-01 17:54 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
2009-09-01 17:53 ` Thomas S. Dye [this message]
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=DA2F4474-C243-42A8-BD64-161765CD433A@tsdye.com \
--to=tsd@tsdye.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).