Yes, that sounds like a good workflow. And if possible, you might want to keep the merged files somewhere for reference, so you can always go back to a previous state.
You can also automate the merging process in Python btw – I've posted a little snippet here: