Hacker News new | ask | show | jobs
by pilif 4284 days ago
We're using atomic commits since 2009 when we moved to git. However: we very often merge features with --no-ff to make it way easier to back them out at once if needed.

That way you get the best of both worlds (very easy archeology and very easy backing out of features)