Date: Tue, 16 Feb 2010 11:22:15 -0700 From: Steve Franks <bahamasfranks@gmail.com> To: Peter Kirk <peterki@korbitec.com> Cc: freebsd-questions@freebsd.org Subject: Re: freebsd-update - Automatic merge Message-ID: <539c60b91002161022j49105483l62ffbede050c42e1@mail.gmail.com> In-Reply-To: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int> References: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <peterki@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? =A0This would take forever on our production > servers > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.o= rg" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?539c60b91002161022j49105483l62ffbede050c42e1>