freebsd-update - Automatic merge

[Chris Rees]

On 16 February 2010 18:22, Steve Franks <bahamasfranks at gmail.com> wrote:
> On Tue, Feb 16, 2010 at 3:55 AM, Peter Kirk <peterki at korbitec.com> 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/amd.map
>> 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

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

Thanks Steve, that's helped me too!

Quick reference, the page he's referring to is
http://lists.freebsd.org/pipermail/freebsd-questions/2009-August/203831.html

Some day I'll submit that to doc@

Chris