That sucks. At least that problem is short-lived, though (until our next release), and people who need pre-C++11 have an option still.
This is getting pretty complicated and I’m pretty worried about having a diverged master and develop like that with multiple commits that are duplicated (we’d actually need at least 3, there’s another one needed to make the tests pass on g+±4.9). Spot checking the conflicts looks fine but I would definitely not feel comfortable extrapolating when we’re fucking with the history like this. I’ve been burned before by automatic merge conflict resolution.
Is this worth the trouble to do this as a C++99 release at all? It’s also a bad time for me personally to be doing backflips in git - I really need to work on this SBC paper.