The general principle in this article is a good one, but the specific scenario he described does not have to happen.

Be granular in how you check in your changes, and backing things out (especially loosely coupled code like debug logging and senseless exception handling) carries low to no risk.

I became good at this when emacs vc-mode made it easy.