Configure git's merge.defaultToUpstream
Hopefully this fixes https://binary-factory.kde.org/view/Management/job/Kate_Nightly_appimage-centos7/2/console
Note: Please don't trigger a new craft cache build job after merging this - I think we first need to get binary-factory-tooling!140 (closed) in