News for hackers. Stuff that matters.
Re:Tower 2 by tkschmidt on Tuesday July 22, 2014 @08:17AM (#8068512)
Is there an option to automatically merge --non-ff a feature branch into development? "Finish feature" seems to use just merge
Re:Tower 2 by tobidobi on Tuesday July 22, 2014 @08:24AM (#8068532)
In the standard "Merge" dialog (see toolbar button), the option "Always generate merge commit" will make sure the merge is --no-ff.
Re:Tower 2 by tkschmidt on Tuesday July 22, 2014 @08:28AM (#8068548)
but this option doesn't work for the "finish feature" part of git-flow