sysmerge(8) will handle all that config file diffing and change reconciliation. Of course not a bad idea at all to back up important stuff before an upgrade.