Checking in changes made in-place on the server to be merged