Nick Dokos <nicholas.do...@hp.com> writes: > Thomas S. Dye <t...@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 _______________________________________________ Emacs-orgmode mailing list Remember: use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
