freebsd-update - Automatic merge

Steve Franks bahamasfranks at
Tue Feb 16 18:22:17 UTC 2010

Search the list archives for emails pertaining to mergemaster.rc - it
worked wonders for me!


On Tue, Feb 16, 2010 at 3:55 AM, Peter Kirk <peterki at> wrote:
> 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
> manually...
> 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
> servers
> _______________________________________________
> freebsd-questions at mailing list
> To unsubscribe, send any mail to "freebsd-questions-unsubscribe at"

More information about the freebsd-questions mailing list