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 Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf Blofeld V1.15B11: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
