Change to branch merging / rebasing strategy

Testing on diorcety 'official' then 'mingw-w64-updates' branches.