Set default merge strategy per branch

Having a default merge strategy is a great start, but we need to be able to set it per branch for it to be really useful.

I suggest to set the merge strategy for a target branch. For our feature branches merged into a dev branch we want to squash all commits. But for the dev -> master merge we do not want to squash but keep dev and master branch exact replicas.