3 Oct
2014
3 Oct
'14
7:47 a.m.
Hello Ian, Erik,
You could try merging from the master branch into your branches. Git should be able to identify the rearrangement.
Ian: Ok, I'll try some things (including the merge) and see what works best. Erik: I was actually not referring to the branches in the main Carpet repository but to branches that I keep in my own local repository (eg unfinished experiments, rejected features that I occasionally continue to use myself, this kind of stuff).
Yours, Roland
--
My email is as private as my paper mail. I therefore support encrypting
and signing email messages. Get my PGP key from http://keys.gnupg.net.