Yeah that's right. We create "patch parts" that contain the updates, and merge them along with the usual merge process.