Yeah I'm a big fan of branching for basically every change, as it provides a known good checkpoint.