From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: make update error Date: Tue, 01 Sep 2009 10:07:47 -0400 Message-ID: <877hwisqq4.fsf@gollum.intra.norang.ca> References: <34C923AA-FD76-43C3-8B5D-8433E27036A5@tsdye.com> <11144.1251784418@gamaville.dokosmarshall.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MiU1c-0002kc-Fa for emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:07:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MiU1Z-0002f8-SU for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:07:56 -0400 Received: from [199.232.76.173] (port=44380 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MiU1Z-0002ep-Oq for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:07:53 -0400 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:53092) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MiU1Z-0002nQ-6d for Emacs-orgmode@gnu.org; Tue, 01 Sep 2009 10:07:53 -0400 In-Reply-To: <11144.1251784418@gamaville.dokosmarshall.org> (Nick Dokos's message of "Tue\, 01 Sep 2009 01\:53\:38 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: nicholas.dokos@hp.com Cc: Emacs-orgmode@gnu.org Nick Dokos writes: > Thomas S. Dye 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