Yup, exactly that. It's a bit of a pain having to move changes between branches, but not other sensible way to do it