[tkschmidt]

Is there an option to automatically merge --non-ff a feature branch into development? "Finish feature" seems to use just merge

[tobidobi]

In the standard "Merge" dialog (see toolbar button), the option "Always generate merge commit" will make sure the merge is --no-ff.

[tkschmidt]

but this option doesn't work for the "finish feature" part of git-flow