This is what we're doing as well. No merged commits to master