&gt; If you do need to back out a feature, how would you do it on a rebased, fast-forward merge?<p>I&#x27;ve never been on a team where we fast-forward-merged multiple commits as a feature. (I&#x27;m sure it happens, but I can&#x27;t see it working well.) What I have seen is fast-forward-merging a single commit (which is equivalent to a cherry-pick, at that point), after using git rebase to squash the feature branch into one single atomic commit and rebasing that commit against master in preparation for mainlining.<p>Then, you&#x27;ll never have merge conflicts (if you do, you didn&#x27;t rebase against master properly prior to the merge), and if we need to revert a feature, the feature lives in master as a single commit.