From: Bernt Hansen <bernt@norang.ca>
To: nicholas.dokos@hp.com
Cc: Emacs-orgmode@gnu.org
Subject: Re: make update error
Date: Tue, 01 Sep 2009 10:07:47 -0400 [thread overview]
Message-ID: <877hwisqq4.fsf@gollum.intra.norang.ca> (raw)
In-Reply-To: <11144.1251784418@gamaville.dokosmarshall.org> (Nick Dokos's message of "Tue\, 01 Sep 2009 01\:53\:38 -0400")
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
next prev parent reply other threads:[~2009-09-01 14:07 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 [this message]
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=877hwisqq4.fsf@gollum.intra.norang.ca \
--to=bernt@norang.ca \
--cc=Emacs-orgmode@gnu.org \
--cc=nicholas.dokos@hp.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).