(There are other SCMs besides git such as mercurial that do cheap branching so pick one. So long as you're not using SVN/CVS you're safe.)
The goal of this is not to stop being wrong, it's to understand why you're wrong and to know how to be wrong at the right place and the right time.