This is best workflow I've used so far (but usually I had separate branch for really unrelated changes).