6.2-Release to 6.3-Release and automatically merge changes

[Zbigniew Szalbot]

Hello,

Encouraged by an apparent ease of use of FreeBSD update utility to go
to 6.3 I decided to perform the update on an office machine, too. I
issued:

$ sh freebsd-update.sh -f freebsd-update.conf -r 6.3-RELEASE upgrade

and after some time there came a screen like this:

Attempting to automatically merge changes in files... done.

The following file could not be merged automatically:
/etc/defaults/periodic.conf
Press Enter to edit this file in vi and resolve the conflicts
manually...

<<<<<<< current version
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.1 2006/03/08
23:01:18 brueffer Exp $
=======
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.3.2.1 2007/12/06
08:11:19 jhb Exp $
>>>>>>> 6.3-RELEASE

Now, I can't be 100% certain but I think I have never touched
periodic.conf and not really sure how to progress on from here.

Another example is rc.conf which of course I edited in the past adding
various services as needed.

<<<<<<< current version
=======
#background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background.
synchronous_dhclient="YES"      # Start dhclient directly on configured
                                # interfaces during startup.
>>>>>>> 6.3-RELEASE

Then it asked about sendmail files which I have never ever touched (I
do not use sendmail). Some others are not sendmail-related but I have
not touched them either.

/etc/mail/freebsd.cf
/etc/mail/freebsd.mc
/etc/mail/freebsd.submit.cf
/etc/mail/freebsd.submit.mc
/etc/mail/helpfile
/etc/mail/sendmail.cf
/etc/mail/submit.cf
/etc/network.subr
/etc/pccard_ether
/etc/rc.d/ldconfig
/etc/rc.d/mountcritlocal
/etc/rc.d/moused
/etc/rc.d/netif
/etc/rc.d/nsswitch
/etc/rc.d/ppp
/etc/rc.d/ypxfrd
/etc/rc.initdiskless
/etc/rc.subr
/etc/snmpd.config

What would you advise me to do? I seem to remember I had a similar
trouble going from 6.1 to 6.2. In that case I must have made some
mistakes while merging changes because the machine wouldn't start. I
seem to recall that I had to copy /etc from backup to make the machine
work. I fear it may happen again and I am not really sure which part
of the files I should be editing as - frankly - I have no idea what
the changes are.

Any advice? Many thanks in advance!

Zbigniew Szalbot