This is how I also do it, and with ediff-files it is fairly quick to resolve whatever conflicts inevitably come up anyway.