github_merge: always to a merge commit (--no-ff)