Is there an option to automatically merge --non-ff a feature branch into develop... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		tkschmidt on July 22, 2014 \| parent \| context \| favorite \| on: Tower 2 Is there an option to automatically merge --non-ff a feature branch into development? "Finish feature" seems to use just merge

tobidobi on July 22, 2014 [–]

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

tkschmidt on July 22, 2014 | [–]

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

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact