When updating from 3.0.6 using the automatic updater installer, when it gets to the part, where it scans the files for differences, what's the best solution to choose? Merge differences?

This really depends on what you did. In principle, the way to go would be to check all files that requires some merge, in order to make sure that you do not lose something you added on purpose. It's quite easier if you did identify all your edits with comments.
If for some files, you are sure that you did not mod them, then using the new file is better (and faster).

Of course, it's a lot safer to do this off-line first, especially when you have some changed files.

dcz wrote:This really depends on what you did. In principle, the way to go would be to check all files that requires some merge, in order to make sure that you do not lose something you added on purpose. It's quite easier if you did identify all your edits with comments.
If for some files, you are sure that you did not mod them, then using the new file is better (and faster).

Of course, it's a lot safer to do this off-line first, especially when you have some changed files.

Okay, I went through each file, side by side and compared difference. Think I'm good to go, just updated to 3.0.7 premod. Now, is there anything related to your mods that I need to re-run, like install or anything. I noticed my feeds are still working, sitemap, etc. But just want to make sure i"m not missing anything.

Thanks

Once all files and db are updated, you'll just have to hit gym_sitemaps/gym_install.php in update mode (will just update the version) and go acp to generate and implement your new.htaccess (required for the newly rewritten urls).
And you'll be all good
++