make feature finish do a no-ff merge even there's only 1 commit in the branch