Settings for merge commit
Always create a merge commit even when fast-forward merge is possible
Use fast-forward merge if possible