I usually can sell rebase+FF to a team by using rev-parse to revert a range of commits immediately without conflict. It's a little more effort to get in the ha

I usually can sell rebase+FF to a team by using rev-parse to revert a range of commits immediately without conflict. It's a little more effort to get in the habit of, but it pays dividends.