Re: freebsd-update - Automatic merge

2010-02-17 Thread Chris Rees
On 16 February 2010 18:22, Steve Franks bahamasfra...@gmail.com wrote: On Tue, Feb 16, 2010 at 3:55 AM, Peter Kirk pete...@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

freebsd-update - Automatic merge

2010-02-16 Thread Peter Kirk
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

freebsd-update - Automatic merge

2010-02-16 Thread Peter Kirk
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

Re: freebsd-update - Automatic merge

2010-02-16 Thread Steve Franks
Search the list archives for emails pertaining to mergemaster.rc - it worked wonders for me! Steve On Tue, Feb 16, 2010 at 3:55 AM, Peter Kirk pete...@korbitec.com wrote: Updating freebsd 7.2 to 8 and fan the following command freebsd-update upgrade -r 8.0-RELEASE Everything goes through