Never do ff so we get a merge commit on every feature finish.