Hi Alan, Achim Gratz <strom...@nexgo.de> writes:
> Alan Schmitt writes: >> I'll commit as soon as I can find the magic git incantations to get rid >> of the "merge" commits that happened as I was pulling changes from the >> repository. > > Just cherry-pick your changes on top of the new master or use the > rewrite facility in magit. If you want to avoid this in general, see: > > http://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development ... or simply don't worry too much about the merge commits. -- Bastien
