More generally, plan your work. For a big change, find valid intermediate states to get from where you are to where you want to be. Always keep the build workin

More generally, plan your work. For a big change, find valid intermediate states to get from where you are to where you want to be. Always keep the build working and tests passing but accept that there may be redundancy or inefficiency until you finish the series of changes. Sometimes you have a change partially complete and realize you need to make another distinct change in order to finish this one. Have the discipline to stash this change, do that one in its own commit, then continue working on this one.