At the link above in step 3, bullet point 2 it states the following:
Merge your live website with the upgraded one.
If you want to merge the locally upgraded website with the production website without replacing the database, perform the following:
Package the upgraded website without the configuration files from ~/App_Data/Sitefinity/Configuration. Do not include the locally upgraded database.
Are all files to not be included? I would think that the dataconfig.config file would be needed since that includes the connection to the DB. Anyone perform an upgrade via a merge that could answer this?