freebsd-update - Automatic merge

Peter Kirk peterki at
Tue Feb 16 10:55:44 UTC 2010

Updating freebsd 7.2 to 8 and fan the following command 

freebsd-update upgrade -r 8.0-RELEASE

Everything goes through fine but then it gets to a point and its says 

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

It goes through hundreds of files, and it wants me to do the editing all
myself, is there not automatic way to do this or just a simple yes no
like mergemaster would ask?  This would take forever on our production

More information about the freebsd-questions mailing list