@Michael Vogel The wrong tracking probably led to the earlier revert, but I don’t think it has anything to do with the changed merge strategy.
I wanted to have @Tobias ’s input since he’s repository admin on GitHub so he could have changed a setting.