Merge no ff

The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward.