On Thu, Aug 04, 2016 at 03:50:51AM -0400, Mark H Weaver wrote: > How about reverting the squashed commit and then re-doing a proper merge > from 'core-updates-2016-08-01' into 'master'?
If this is possible without too many complications, that sounds like a good option; the earlier the better, probably, before there are too many new conflicts. Hm, I just tried the revert part, and it already creates a conflict. Andreas
