[10:16] I'm working on a feature which isn't ready yet but I have to stop for a while and make a more important change to the newest revision in the main repo. What is the best practice for this kind of situation? [10:19] Should I make a new local branch, commit and switch to the trunk?