git merge --no-ff -Xignore-space-at-eol some-branch